diff --git a/specs/1.3.1/_viz.rnc b/specs/1.3.1/_viz.rnc
index c16a57b..b6cce86 100644
--- a/specs/1.3.1/_viz.rnc
+++ b/specs/1.3.1/_viz.rnc
@@ -140,10 +140,22 @@ sizes-scale-content = scale-label-attribute?
     }
 thicknesses-scale-content = scale-label-attribute?
     & attribute scale {"quantitative"} 
-    & element scalepoint {
-        for-ratio-attribute
-        & attribute factor {xsd:float}
-    }*
+    & element transform {
+        (element pow { attribute exponent {xsd:integer}}|
+        element sqrt {empty}|
+        element log {empty}|
+        element log10 {empty}|
+        element exp {empty}|
+        element exp10 {empty}|
+        element spline {
+            element origin-control-point { 
+               control-point-content
+            },
+            element destination-control-point { 
+                control-point-content
+            }
+        })
+    }
     & element range {
         attribute min { thickness-type },
         attribute max { thickness-type },
diff --git a/specs/1.3.1/_viz.rng b/specs/1.3.1/_viz.rng
index b56d7ba..b7e0f27 100644
--- a/specs/1.3.1/_viz.rng
+++ b/specs/1.3.1/_viz.rng
@@ -318,16 +318,38 @@
       <attribute name="scale">
         <value>quantitative</value>
       </attribute>
-      <zeroOrMore>
-        <element name="scalepoint">
-          <interleave>
-            <ref name="for-ratio-attribute"/>
-            <attribute name="factor">
-              <data type="float"/>
+      <element name="transform">
+        <choice>
+          <element name="pow">
+            <attribute name="exponent">
+              <data type="integer"/>
             </attribute>
-          </interleave>
-        </element>
-      </zeroOrMore>
+          </element>
+          <element name="sqrt">
+            <empty/>
+          </element>
+          <element name="log">
+            <empty/>
+          </element>
+          <element name="log10">
+            <empty/>
+          </element>
+          <element name="exp">
+            <empty/>
+          </element>
+          <element name="exp10">
+            <empty/>
+          </element>
+          <element name="spline">
+            <element name="origin-control-point">
+              <ref name="control-point-content"/>
+            </element>
+            <element name="destination-control-point">
+              <ref name="control-point-content"/>
+            </element>
+          </element>
+        </choice>
+      </element>
       <element name="range">
         <attribute name="min">
           <ref name="thickness-type"/>
diff --git a/specs/1.3.1/_viz.xsd b/specs/1.3.1/_viz.xsd
index c6d3fba..7d1979d 100644
--- a/specs/1.3.1/_viz.xsd
+++ b/specs/1.3.1/_viz.xsd
@@ -1,64 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://gexf.net/1.3.1/viz" xmlns:ns1="http://gexf.net/1.3" xmlns:viz="http://gexf.net/1.3.1/viz" xmlns:ns2="http://gexf.net/1.3.1">
+  <xs:import namespace="http://gexf.net/1.3" schemaLocation="ns1.xsd"/>
+  <xs:import namespace="http://gexf.net/1.3.1" schemaLocation="gexf.xsd"/>
   <!-- Extends node -->
-  <xs:group name="node-content">
-    <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="color">
-          <xs:complexType>
-            <xs:attributeGroup ref="color-content"/>
-          </xs:complexType>
-        </xs:element>
-        <xs:element ref="position"/>
-        <xs:element ref="size"/>
-        <xs:element name="shape">
-          <xs:complexType>
-            <xs:attributeGroup ref="node-shape-content"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:choice>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="position">
-    <xs:complexType>
-      <xs:attributeGroup ref="position-content"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="size">
-    <xs:complexType>
-      <xs:attributeGroup ref="size-content"/>
-    </xs:complexType>
-  </xs:element>
   <!-- Extend edge -->
-  <xs:group name="edge-content">
-    <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="color">
-          <xs:complexType>
-            <xs:attributeGroup ref="color-content"/>
-          </xs:complexType>
-        </xs:element>
-        <xs:element ref="thickness"/>
-        <xs:element name="shape">
-          <xs:complexType>
-            <xs:attributeGroup ref="edge-shape-content"/>
-          </xs:complexType>
-        </xs:element>
-      </xs:choice>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="thickness">
-    <xs:complexType>
-      <xs:attributeGroup ref="thickness-content"/>
-    </xs:complexType>
-  </xs:element>
   <!-- Color -->
   <xs:attributeGroup name="color-content">
-    <xs:attribute name="r" type="color-channel"/>
-    <xs:attribute name="g" type="color-channel"/>
-    <xs:attribute name="b" type="color-channel"/>
+    <xs:attribute name="r" type="viz:color-channel"/>
+    <xs:attribute name="g" type="viz:color-channel"/>
+    <xs:attribute name="b" type="viz:color-channel"/>
     <xs:attribute name="hex" type="xs:token"/>
-    <xs:attribute name="a" type="alpha-channel"/>
+    <xs:attribute name="a" type="viz:alpha-channel"/>
   </xs:attributeGroup>
   <!-- Position -->
   <xs:attributeGroup name="position-content">
@@ -68,20 +20,20 @@
   </xs:attributeGroup>
   <!-- Size -->
   <xs:attributeGroup name="size-content">
-    <xs:attribute name="value" use="required" type="size-type"/>
+    <xs:attribute name="value" use="required" type="viz:size-type"/>
   </xs:attributeGroup>
   <!-- Thickness -->
   <xs:attributeGroup name="thickness-content">
-    <xs:attribute name="value" use="required" type="thickness-type"/>
+    <xs:attribute name="value" use="required" type="viz:thickness-type"/>
   </xs:attributeGroup>
   <!-- Node shape -->
   <xs:attributeGroup name="node-shape-content">
-    <xs:attribute name="value" use="required" type="node-shape-type"/>
+    <xs:attribute name="value" use="required" type="viz:node-shape-type"/>
     <xs:attribute name="uri" type="xs:anyURI"/>
   </xs:attributeGroup>
   <!-- Edge shape -->
   <xs:attributeGroup name="edge-shape-content">
-    <xs:attribute name="value" use="required" type="edge-shape-type"/>
+    <xs:attribute name="value" use="required" type="viz:edge-shape-type"/>
   </xs:attributeGroup>
   <!-- Color -->
   <xs:simpleType name="color-channel">
@@ -152,21 +104,8 @@
       <xs:documentation>colors scale content</xs:documentation>
     </xs:annotation>
     <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="color">
-        <xs:complexType>
-          <xs:attributeGroup ref="color-content"/>
-          <xs:attribute name="forvalue" type="xs:string"/>
-          <xs:attribute name="forratio">
-            <xs:simpleType>
-              <xs:restriction base="xs:float">
-                <xs:minInclusive value="0"/>
-                <xs:maxInclusive value="1.0"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-        </xs:complexType>
-      </xs:element>
-      <xs:element ref="colordefault"/>
+      <xs:element ref="viz:color"/>
+      <xs:element ref="viz:colordefault"/>
     </xs:choice>
     <xs:attribute name="scale" use="required">
       <xs:simpleType>
@@ -178,9 +117,23 @@
     </xs:attribute>
     <xs:attribute name="scalelabel" type="xs:string"/>
   </xs:complexType>
+  <xs:element name="color">
+    <xs:complexType>
+      <xs:attributeGroup ref="viz:color-content"/>
+      <xs:attribute name="forvalue" type="xs:string"/>
+      <xs:attribute name="forratio">
+        <xs:simpleType>
+          <xs:restriction base="xs:float">
+            <xs:minInclusive value="0"/>
+            <xs:maxInclusive value="1.0"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="colordefault">
     <xs:complexType>
-      <xs:attributeGroup ref="color-content"/>
+      <xs:attributeGroup ref="viz:color-content"/>
     </xs:complexType>
   </xs:element>
   <xs:complexType name="shapes-content">
@@ -188,18 +141,8 @@
       <xs:documentation>shapes scale content</xs:documentation>
     </xs:annotation>
     <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="shape">
-        <xs:complexType>
-          <xs:attribute name="value" use="required">
-            <xs:simpleType>
-              <xs:union memberTypes="node-shape-type edge-shape-type"/>
-            </xs:simpleType>
-          </xs:attribute>
-          <xs:attribute name="uri" type="xs:anyURI"/>
-          <xs:attributeGroup ref="for-value-attribute"/>
-        </xs:complexType>
-      </xs:element>
-      <xs:element ref="shapedefault"/>
+      <xs:element ref="viz:shape"/>
+      <xs:element ref="viz:shapedefault"/>
     </xs:choice>
     <xs:attribute name="scalelabel" type="xs:string"/>
     <xs:attribute name="scale" use="required">
@@ -210,11 +153,22 @@
       </xs:simpleType>
     </xs:attribute>
   </xs:complexType>
+  <xs:element name="shape">
+    <xs:complexType>
+      <xs:attribute name="value" use="required">
+        <xs:simpleType>
+          <xs:union memberTypes="viz:node-shape-type viz:edge-shape-type"/>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="uri" type="xs:anyURI"/>
+      <xs:attributeGroup ref="viz:for-value-attribute"/>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="shapedefault">
     <xs:complexType>
       <xs:attribute name="value" use="required">
         <xs:simpleType>
-          <xs:union memberTypes="node-shape-type edge-shape-type"/>
+          <xs:union memberTypes="viz:node-shape-type viz:edge-shape-type"/>
         </xs:simpleType>
       </xs:attribute>
       <xs:attribute name="uri" type="xs:anyURI"/>
@@ -230,17 +184,17 @@
     </xs:restriction>
   </xs:simpleType>
   <xs:attributeGroup name="control-point-content">
-    <xs:attribute name="x" use="required" type="control-point-type"/>
-    <xs:attribute name="y" use="required" type="control-point-type"/>
+    <xs:attribute name="x" use="required" type="viz:control-point-type"/>
+    <xs:attribute name="y" use="required" type="viz:control-point-type"/>
   </xs:attributeGroup>
   <xs:complexType name="sizes-scale-content">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="transform"/>
+      <xs:element ref="viz:transform"/>
       <xs:element name="range">
         <xs:complexType>
-          <xs:attribute name="min" use="required" type="size-type"/>
-          <xs:attribute name="max" use="required" type="size-type"/>
-          <xs:attribute name="default" use="required" type="size-type"/>
+          <xs:attribute name="min" use="required" type="viz:size-type"/>
+          <xs:attribute name="max" use="required" type="viz:size-type"/>
+          <xs:attribute name="default" use="required" type="viz:size-type"/>
         </xs:complexType>
       </xs:element>
     </xs:choice>
@@ -256,13 +210,13 @@
   <xs:element name="transform">
     <xs:complexType>
       <xs:choice>
-        <xs:element ref="pow"/>
-        <xs:element ref="sqrt"/>
-        <xs:element ref="log"/>
-        <xs:element ref="log10"/>
-        <xs:element ref="exp"/>
-        <xs:element ref="exp10"/>
-        <xs:element ref="spline"/>
+        <xs:element ref="viz:pow"/>
+        <xs:element ref="viz:sqrt"/>
+        <xs:element ref="viz:log"/>
+        <xs:element ref="viz:log10"/>
+        <xs:element ref="viz:exp"/>
+        <xs:element ref="viz:exp10"/>
+        <xs:element ref="viz:spline"/>
       </xs:choice>
     </xs:complexType>
   </xs:element>
@@ -289,29 +243,29 @@
   <xs:element name="spline">
     <xs:complexType>
       <xs:sequence>
-        <xs:element ref="origin-control-point"/>
-        <xs:element ref="destination-control-point"/>
+        <xs:element ref="viz:origin-control-point"/>
+        <xs:element ref="viz:destination-control-point"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="origin-control-point">
     <xs:complexType>
-      <xs:attributeGroup ref="control-point-content"/>
+      <xs:attributeGroup ref="viz:control-point-content"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="destination-control-point">
     <xs:complexType>
-      <xs:attributeGroup ref="control-point-content"/>
+      <xs:attributeGroup ref="viz:control-point-content"/>
     </xs:complexType>
   </xs:element>
   <xs:complexType name="thicknesses-scale-content">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="scalepoint"/>
+      <xs:element ref="viz:transform"/>
       <xs:element name="range">
         <xs:complexType>
-          <xs:attribute name="min" use="required" type="thickness-type"/>
-          <xs:attribute name="max" use="required" type="thickness-type"/>
-          <xs:attribute name="default" use="required" type="thickness-type"/>
+          <xs:attribute name="min" use="required" type="viz:thickness-type"/>
+          <xs:attribute name="max" use="required" type="viz:thickness-type"/>
+          <xs:attribute name="default" use="required" type="viz:thickness-type"/>
         </xs:complexType>
       </xs:element>
     </xs:choice>
@@ -324,16 +278,10 @@
       </xs:simpleType>
     </xs:attribute>
   </xs:complexType>
-  <xs:element name="scalepoint">
-    <xs:complexType>
-      <xs:attributeGroup ref="for-ratio-attribute"/>
-      <xs:attribute name="factor" use="required" type="xs:float"/>
-    </xs:complexType>
-  </xs:element>
   <xs:element name="layout">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="param"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="viz:param"/>
       </xs:sequence>
       <xs:attribute name="algorithm" use="required" type="xs:string"/>
       <xs:attribute name="step" use="required" type="xs:positiveInteger"/>
@@ -343,47 +291,31 @@
   <xs:element name="param">
     <xs:complexType>
       <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute name="type" use="required" type="attrtype-type"/>
+      <xs:attribute name="type" use="required" type="ns2:attrtype-type"/>
       <xs:attribute name="value" use="required" type="xs:string"/>
     </xs:complexType>
   </xs:element>
   <!-- Extends attribute with scales -->
-  <xs:group name="attribute-content">
-    <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="colors"/>
-        <xs:element ref="shapes"/>
-        <xs:element ref="sizes"/>
-        <xs:element ref="thicknesses"/>
+  <xs:complexType name="attribute-content">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:choice>
+        <xs:element ref="viz:colors"/>
+        <xs:element ref="viz:shapes"/>
+        <xs:element ref="viz:sizes"/>
+        <xs:element ref="viz:thicknesses"/>
       </xs:choice>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="colors" type="colors-content"/>
-  <xs:element name="shapes" type="shapes-content"/>
-  <xs:element name="sizes" type="sizes-scale-content"/>
-  <xs:element name="thicknesses" type="thicknesses-scale-content"/>
-  <!-- Extends attributes with positions and defaultscales -->
-  <xs:group name="attributes-content">
-    <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="positions"/>
-        <xs:element ref="defaultscales"/>
+      <xs:choice>
+        <xs:element ref="ns2:default"/>
+        <xs:element ref="ns2:options"/>
       </xs:choice>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="positions">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="layout"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="defaultscales">
-    <xs:complexType>
-      <xs:attribute name="colors" type="id-type"/>
-      <xs:attribute name="sizes" type="id-type"/>
-      <xs:attribute name="shapes" type="id-type"/>
-      <xs:attribute name="thicknesses" type="id-type"/>
-    </xs:complexType>
-  </xs:element>
+    </xs:choice>
+    <xs:attribute name="id" use="required" type="ns2:id-type"/>
+    <xs:attribute name="title" use="required" type="xs:string"/>
+    <xs:attribute name="type" use="required" type="ns2:attrtype-type"/>
+  </xs:complexType>
+  <xs:element name="colors" type="viz:colors-content"/>
+  <xs:element name="shapes" type="viz:shapes-content"/>
+  <xs:element name="sizes" type="viz:sizes-scale-content"/>
+  <xs:element name="thicknesses" type="viz:thicknesses-scale-content"/>
+  <!-- Extends attributes with positions and defaultscales -->
 </xs:schema>
diff --git a/specs/1.3.1/common.xsd b/specs/1.3.1/common.xsd
index 508c29c..ca6ae70 100644
--- a/specs/1.3.1/common.xsd
+++ b/specs/1.3.1/common.xsd
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://gexf.net/1.3.1" xmlns:ns1="http://gexf.net/1.3" xmlns:viz="http://gexf.net/1.3.1/viz" xmlns:ns2="http://gexf.net/1.3.1">
+  <xs:import namespace="http://gexf.net/1.3" schemaLocation="ns1.xsd"/>
+  <xs:import namespace="http://gexf.net/1.3.1/viz" schemaLocation="_viz.xsd"/>
   <xs:simpleType name="id-type">
     <xs:union memberTypes="xs:string xs:integer xs:long"/>
   </xs:simpleType>
diff --git a/specs/1.3.1/dynamics.xsd b/specs/1.3.1/dynamics.xsd
index 36a893c..100588a 100644
--- a/specs/1.3.1/dynamics.xsd
+++ b/specs/1.3.1/dynamics.xsd
@@ -1,71 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://gexf.net/1.3" xmlns:ns1="http://gexf.net/1.3">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://gexf.net/1.3.1" xmlns:ns1="http://gexf.net/1.3" xmlns:viz="http://gexf.net/1.3.1/viz" xmlns:ns2="http://gexf.net/1.3.1">
+  <xs:import namespace="http://gexf.net/1.3" schemaLocation="ns1.xsd"/>
+  <xs:import namespace="http://gexf.net/1.3.1/viz" schemaLocation="_viz.xsd"/>
   <!-- Extends graph -->
-  <xs:attributeGroup name="graph-content">
+  <xs:complexType name="graph-content">
     <xs:annotation>
       <xs:documentation>Gext and data extension</xs:documentation>
     </xs:annotation>
-    <xs:attribute name="timeformat" type="ns1:timeformat-type"/>
-    <xs:attribute name="start" type="ns1:time-type"/>
-    <xs:attribute name="end" type="ns1:time-type"/>
-    <xs:attribute name="timestamp" type="ns1:time-type"/>
-    <xs:attribute name="mode" type="ns1:mode-type-graph"/>
-    <xs:attribute name="timerepresentation" type="ns1:timerepresentation-type"/>
+    <xs:sequence>
+      <xs:element minOccurs="0" maxOccurs="unbounded" ref="ns2:attributes"/>
+      <xs:element ref="ns2:nodes"/>
+      <xs:element ref="ns2:edges"/>
+    </xs:sequence>
+    <xs:attribute name="timeformat" type="ns2:timeformat-type"/>
+    <xs:attribute name="start" type="ns2:time-type"/>
+    <xs:attribute name="end" type="ns2:time-type"/>
+    <xs:attribute name="timestamp" type="ns2:time-type"/>
+    <xs:attribute name="mode" type="ns2:mode-type-graph"/>
+    <xs:attribute name="timerepresentation" type="ns2:timerepresentation-type"/>
     <xs:attribute name="timezone" type="xs:token"/>
-  </xs:attributeGroup>
+    <xs:attribute name="defaultedgetype" type="ns2:defaultedgetype-type"/>
+    <xs:attribute name="idtype" type="ns2:idtype-type"/>
+  </xs:complexType>
+  <xs:element name="attributes" type="ns2:attributes-content"/>
+  <xs:element name="nodes" type="ns2:nodes-content"/>
+  <xs:element name="edges" type="ns2:edges-content"/>
   <!-- Extends attributes -->
-  <xs:attributeGroup name="attributes-content">
-    <xs:attribute name="mode" type="ns1:mode-type-attributes"/>
-  </xs:attributeGroup>
+  <xs:complexType name="attributes-content">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:choice>
+        <xs:element ref="ns2:positions"/>
+        <xs:element ref="ns2:defaultscales"/>
+      </xs:choice>
+      <xs:element ref="ns2:attribute"/>
+    </xs:choice>
+    <xs:attribute name="mode" type="ns2:mode-type-attributes"/>
+    <xs:attribute name="class" use="required" type="ns2:class-type"/>
+  </xs:complexType>
+  <xs:element name="positions">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="viz:layout"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="defaultscales">
+    <xs:complexType>
+      <xs:attribute name="colors" type="ns2:id-type"/>
+      <xs:attribute name="sizes" type="ns2:id-type"/>
+      <xs:attribute name="shapes" type="ns2:id-type"/>
+      <xs:attribute name="thicknesses" type="ns2:id-type"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="attribute" type="viz:attribute-content"/>
   <!-- Extends attribute values -->
   <xs:attributeGroup name="attvalue-content">
-    <xs:attribute name="start" type="ns1:time-type"/>
-    <xs:attribute name="end" type="ns1:time-type"/>
-    <xs:attribute name="timestamp" type="ns1:time-type"/>
+    <xs:attribute name="start" type="ns2:time-type"/>
+    <xs:attribute name="end" type="ns2:time-type"/>
+    <xs:attribute name="timestamp" type="ns2:time-type"/>
+    <xs:attribute name="for" use="required" type="ns2:id-type"/>
+    <xs:attribute name="value" use="required" type="xs:string"/>
   </xs:attributeGroup>
   <!-- Extends node -->
-  <xs:group name="node-content">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="ns1:spells"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="spells" type="ns1:spells-content"/>
-  <xs:attributeGroup name="node-content">
-    <xs:attribute name="start" type="ns1:time-type"/>
-    <xs:attribute name="end" type="ns1:time-type"/>
+  <xs:complexType name="node-content">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="ns1:spells"/>
+      <xs:choice>
+        <xs:element ref="ns2:color"/>
+        <xs:element ref="ns2:position"/>
+        <xs:element ref="ns2:size"/>
+        <xs:element name="shape">
+          <xs:complexType>
+            <xs:attributeGroup ref="viz:node-shape-content"/>
+          </xs:complexType>
+        </xs:element>
+      </xs:choice>
+      <xs:element ref="ns2:attvalues"/>
+      <xs:choice>
+        <xs:element ref="ns2:nodes"/>
+        <xs:element ref="ns2:edges"/>
+      </xs:choice>
+      <xs:element ref="ns2:parents"/>
+    </xs:choice>
+    <xs:attribute name="start" type="ns2:time-type"/>
+    <xs:attribute name="end" type="ns2:time-type"/>
     <xs:attribute name="intervals" type="xs:token"/>
-    <xs:attribute name="timestamp" type="ns1:time-type"/>
+    <xs:attribute name="timestamp" type="ns2:time-type"/>
     <xs:attribute name="timestamps" type="xs:token"/>
-  </xs:attributeGroup>
+    <xs:attribute name="id" use="required" type="ns2:id-type"/>
+    <xs:attribute name="label" type="xs:token"/>
+    <xs:attribute name="pid" type="ns2:id-type"/>
+  </xs:complexType>
+  <xs:element name="color">
+    <xs:complexType>
+      <xs:attributeGroup ref="viz:color-content"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="position">
+    <xs:complexType>
+      <xs:attributeGroup ref="viz:position-content"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="size">
+    <xs:complexType>
+      <xs:attributeGroup ref="viz:size-content"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="attvalues" type="ns2:attvalues-content"/>
+  <xs:element name="parents" type="ns2:parents-content"/>
   <!-- Extends edge -->
-  <xs:group name="edge-content">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="ns1:spells"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:attributeGroup name="edge-content">
-    <xs:attribute name="start" type="ns1:time-type"/>
-    <xs:attribute name="end" type="ns1:time-type"/>
+  <xs:complexType name="edge-content">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="ns1:spells"/>
+      <xs:choice>
+        <xs:element ref="ns2:color"/>
+        <xs:element ref="ns2:thickness"/>
+        <xs:element name="shape">
+          <xs:complexType>
+            <xs:attributeGroup ref="viz:edge-shape-content"/>
+          </xs:complexType>
+        </xs:element>
+      </xs:choice>
+      <xs:element ref="ns2:attvalues"/>
+    </xs:choice>
+    <xs:attribute name="start" type="ns2:time-type"/>
+    <xs:attribute name="end" type="ns2:time-type"/>
     <xs:attribute name="intervals" type="xs:token"/>
-    <xs:attribute name="timestamp" type="ns1:time-type"/>
+    <xs:attribute name="timestamp" type="ns2:time-type"/>
     <xs:attribute name="timestamps" type="xs:token"/>
-  </xs:attributeGroup>
+    <xs:attribute name="id" type="ns2:id-type"/>
+    <xs:attribute name="type" type="ns2:edgetype-type"/>
+    <xs:attribute name="label" type="xs:token"/>
+    <xs:attribute name="source" use="required" type="ns2:id-type"/>
+    <xs:attribute name="target" use="required" type="ns2:id-type"/>
+    <xs:attribute name="weight" type="ns2:weight-type"/>
+    <xs:attribute name="kind" type="xs:token"/>
+  </xs:complexType>
+  <xs:element name="thickness">
+    <xs:complexType>
+      <xs:attributeGroup ref="viz:thickness-content"/>
+    </xs:complexType>
+  </xs:element>
   <!-- Spells -->
   <xs:complexType name="spells-content">
     <xs:sequence>
       <xs:element maxOccurs="unbounded" ref="ns1:spell"/>
     </xs:sequence>
   </xs:complexType>
-  <xs:element name="spell">
-    <xs:complexType>
-      <xs:attributeGroup ref="ns1:spell-content"/>
-    </xs:complexType>
-  </xs:element>
   <!-- Spell -->
   <xs:attributeGroup name="spell-content">
-    <xs:attribute name="start" type="ns1:time-type"/>
-    <xs:attribute name="end" type="ns1:time-type"/>
-    <xs:attribute name="timestamp" type="ns1:time-type"/>
+    <xs:attribute name="start" type="ns2:time-type"/>
+    <xs:attribute name="end" type="ns2:time-type"/>
+    <xs:attribute name="timestamp" type="ns2:time-type"/>
   </xs:attributeGroup>
   <!-- Time type -->
   <xs:simpleType name="time-type">