diff --git a/ch.psi.fda.xscan/pom.xml b/ch.psi.fda.xscan/pom.xml
index b91ad20..03e8f4a 100644
--- a/ch.psi.fda.xscan/pom.xml
+++ b/ch.psi.fda.xscan/pom.xml
@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>ch.psi</groupId>
 			<artifactId>ch.psi.fda.core</artifactId>
-			<version>2.3.0</version>
+			<version>2.3.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.psi</groupId>
diff --git a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java
index db8588d..a68a156 100644
--- a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java
+++ b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java
@@ -119,6 +119,7 @@ public class XScanDescriptorProvider implements DescriptorProvider {
 					// TODO Need to actually check if minX of 
 					lineplot.setMinX(new Double(lp.getOffset()));
 					lineplot.setMaxX(new Double(lp.getOffset()+lp.getSize()));
+                                        lineplot.setMaxSeries(lp.getMaxSeries());
 					lineplot.getData().add(new YSeries(idY));
 				}
                                 vd.getPlots().add(lineplot);
@@ -199,6 +200,7 @@ public class XScanDescriptorProvider implements DescriptorProvider {
 				matrixplot.setMinY(minY);
 				matrixplot.setMaxY(maxY);
 				matrixplot.setnY(nY);
+                                matrixplot.setType(mp.getType());
 				
 				matrixplot.getData().add(new XYZSeries(idX, idY, idZ));
 				vd.getPlots().add(matrixplot);
@@ -279,6 +281,7 @@ public class XScanDescriptorProvider implements DescriptorProvider {
 				matrixplot.setMinY(minY);
 				matrixplot.setMaxY(maxY);
 				matrixplot.setnY(nY);
+                                matrixplot.setType(mp.getType());
 				
 				matrixplot.getData().add(new YZSeries(idY, idZ));
 				vd.getPlots().add(matrixplot);
diff --git a/ch.psi.fda.xscan/src/main/resources/model-v1.xsd b/ch.psi.fda.xscan/src/main/resources/model-v1.xsd
index 1760537..09107da 100644
--- a/ch.psi.fda.xscan/src/main/resources/model-v1.xsd
+++ b/ch.psi.fda.xscan/src/main/resources/model-v1.xsd
@@ -20,6 +20,16 @@
     			<xsd:attribute name="x" type="xsd:IDREF" use="required"></xsd:attribute>
     			<xsd:attribute name="y" type="xsd:IDREF" use="required"></xsd:attribute>
     			<xsd:attribute name="z" type="xsd:IDREF" use="required"></xsd:attribute>
+    			<xsd:attribute name="type" default="2D"
+    				use="optional">
+    				<xsd:simpleType>
+    					<xsd:restriction base="xsd:string">
+    						<xsd:enumeration value="2D"></xsd:enumeration>
+    						<xsd:enumeration value="3D"></xsd:enumeration>
+    					</xsd:restriction>
+    				</xsd:simpleType>
+    			</xsd:attribute>
+                        
     		</xsd:extension>
     	</xsd:complexContent>
     </xsd:complexType>
@@ -502,6 +512,15 @@
     			<xsd:attribute name="z" type="xsd:IDREF" use="required"></xsd:attribute>
     			<xsd:attribute name="offset" type="xsd:int" use="optional" default="0"></xsd:attribute>
     			<xsd:attribute name="size" type="xsd:int" use="optional" default="0"></xsd:attribute>
+    			<xsd:attribute name="type" default="2D"
+    				use="optional">
+    				<xsd:simpleType>
+    					<xsd:restriction base="xsd:string">
+    						<xsd:enumeration value="2D"></xsd:enumeration>
+    						<xsd:enumeration value="3D"></xsd:enumeration>
+    					</xsd:restriction>
+    				</xsd:simpleType>
+    			</xsd:attribute>                                                
     		</xsd:extension>
     	</xsd:complexContent>
     </xsd:complexType>