diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ChartItemProviderAdapterFactory.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ChartItemProviderAdapterFactory.class
index edba50dc..e544dcc6 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ChartItemProviderAdapterFactory.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ChartItemProviderAdapterFactory.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ChartProjectItemProvider.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ChartProjectItemProvider.class
index 55367511..87048159 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ChartProjectItemProvider.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ChartProjectItemProvider.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ScatterChart3dFXItemProvider.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ScatterChart3dFXItemProvider.class
new file mode 100644
index 00000000..1b8b23c6
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/ScatterChart3dFXItemProvider.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/SeriesFXItemProvider.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/SeriesFXItemProvider.class
index 83979f09..168d1267 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/SeriesFXItemProvider.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/SeriesFXItemProvider.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/XYZChartFXItemProvider.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/XYZChartFXItemProvider.class
new file mode 100644
index 00000000..ebb314cf
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/XYZChartFXItemProvider.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/XYZSeriesFXItemProvider.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/XYZSeriesFXItemProvider.class
new file mode 100644
index 00000000..0c231204
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/XYZSeriesFXItemProvider.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/XYZValueFXItemProvider.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/XYZValueFXItemProvider.class
new file mode 100644
index 00000000..74772a56
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/bin/de/dc/javafx/xcore/workbench/chart/provider/XYZValueFXItemProvider.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/ScatterChart3dFX.gif b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/ScatterChart3dFX.gif
new file mode 100644
index 00000000..10d22299
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/ScatterChart3dFX.gif differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/XYZSeries.gif b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/XYZSeries.gif
new file mode 100644
index 00000000..e4b530ec
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/XYZSeries.gif differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/XYZSeriesFX.gif b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/XYZSeriesFX.gif
new file mode 100644
index 00000000..59155918
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/XYZSeriesFX.gif differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/XYZValueFX.gif b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/XYZValueFX.gif
new file mode 100644
index 00000000..b3643da0
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/icons/full/obj16/XYZValueFX.gif differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/plugin.properties b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/plugin.properties
index c6d6e5a2..bbd6d397 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/plugin.properties
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/plugin.properties
@@ -236,3 +236,16 @@ _UI_AreaChart3dFX_type = Area Chart3d FX
 _UI_BarChart3dFX_type = Bar Chart3d FX
 _UI_LineChart3dFX_type = Line Chart3d FX
 _UI_PieChart3dFX_type = Pie Chart3d FX
+_UI_XYZChartFX_type = XYZ Chart FX
+_UI_XYZSeries_type = XYZ Series
+_UI_ScatterChart3dFX_type = Scatter Chart3d FX
+_UI_XYZChartFX_series_feature = Series
+_UI_XYZSeries_name_feature = Name
+_UI_XYZSeries_values_feature = Values
+_UI_XYZValueFX_type = XYZ Value FX
+_UI_XYZValueFX_x_feature = X
+_UI_XYZValueFX_y_feature = Y
+_UI_XYZValueFX_z_feature = Z
+_UI_XYZSeriesFX_type = XYZ Series FX
+_UI_XYZSeriesFX_name_feature = Name
+_UI_XYZSeriesFX_values_feature = Values
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ChartItemProviderAdapterFactory.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ChartItemProviderAdapterFactory.java
index c8141af5..fffa883e 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ChartItemProviderAdapterFactory.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ChartItemProviderAdapterFactory.java
@@ -97,6 +97,29 @@ public Adapter createChartProjectAdapter() {
 		return chartProjectItemProvider;
 	}
 
+	/**
+	 * This keeps track of the one adapter used for all {@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XYZSeriesFXItemProvider xyzSeriesFXItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createXYZSeriesFXAdapter() {
+		if (xyzSeriesFXItemProvider == null) {
+			xyzSeriesFXItemProvider = new XYZSeriesFXItemProvider(this);
+		}
+
+		return xyzSeriesFXItemProvider;
+	}
+
 	/**
 	 * This keeps track of the one adapter used for all {@link de.dc.javafx.xcore.workbench.chart.CategorySeriesFX} instances.
 	 * <!-- begin-user-doc -->
@@ -166,6 +189,29 @@ public Adapter createXYValueFXAdapter() {
 		return xyValueFXItemProvider;
 	}
 
+	/**
+	 * This keeps track of the one adapter used for all {@link de.dc.javafx.xcore.workbench.chart.XYZValueFX} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XYZValueFXItemProvider xyzValueFXItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link de.dc.javafx.xcore.workbench.chart.XYZValueFX}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createXYZValueFXAdapter() {
+		if (xyzValueFXItemProvider == null) {
+			xyzValueFXItemProvider = new XYZValueFXItemProvider(this);
+		}
+
+		return xyzValueFXItemProvider;
+	}
+
 	/**
 	 * This keeps track of the one adapter used for all {@link de.dc.javafx.xcore.workbench.chart.CategoryValueFX} instances.
 	 * <!-- begin-user-doc -->
@@ -396,6 +442,29 @@ public Adapter createPieChart3dFXAdapter() {
 		return pieChart3dFXItemProvider;
 	}
 
+	/**
+	 * This keeps track of the one adapter used for all {@link de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ScatterChart3dFXItemProvider scatterChart3dFXItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createScatterChart3dFXAdapter() {
+		if (scatterChart3dFXItemProvider == null) {
+			scatterChart3dFXItemProvider = new ScatterChart3dFXItemProvider(this);
+		}
+
+		return scatterChart3dFXItemProvider;
+	}
+
 	/**
 	 * This keeps track of the one adapter used for all {@link de.dc.javafx.xcore.workbench.chart.BarChartFX} instances.
 	 * <!-- begin-user-doc -->
@@ -549,12 +618,16 @@ public void fireNotifyChanged(Notification notification) {
 	public void dispose() {
 		if (chartProjectItemProvider != null)
 			chartProjectItemProvider.dispose();
+		if (xyzSeriesFXItemProvider != null)
+			xyzSeriesFXItemProvider.dispose();
 		if (categorySeriesFXItemProvider != null)
 			categorySeriesFXItemProvider.dispose();
 		if (seriesFXItemProvider != null)
 			seriesFXItemProvider.dispose();
 		if (xyValueFXItemProvider != null)
 			xyValueFXItemProvider.dispose();
+		if (xyzValueFXItemProvider != null)
+			xyzValueFXItemProvider.dispose();
 		if (categoryValueFXItemProvider != null)
 			categoryValueFXItemProvider.dispose();
 		if (lineChartFXItemProvider != null)
@@ -577,6 +650,8 @@ public void dispose() {
 			lineChart3dFXItemProvider.dispose();
 		if (pieChart3dFXItemProvider != null)
 			pieChart3dFXItemProvider.dispose();
+		if (scatterChart3dFXItemProvider != null)
+			scatterChart3dFXItemProvider.dispose();
 		if (chartFXConfigItemProvider != null)
 			chartFXConfigItemProvider.dispose();
 	}
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ChartProjectItemProvider.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ChartProjectItemProvider.java
index f4b482f1..1aa043a3 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ChartProjectItemProvider.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ChartProjectItemProvider.java
@@ -235,6 +235,9 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors
 
 		newChildDescriptors.add(createChildParameter(ChartPackage.Literals.CHART_PROJECT__CHARTS,
 				ChartFactory.eINSTANCE.createPieChart3dFX()));
+
+		newChildDescriptors.add(createChildParameter(ChartPackage.Literals.CHART_PROJECT__CHARTS,
+				ChartFactory.eINSTANCE.createScatterChart3dFX()));
 	}
 
 	/**
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ScatterChart3dFXItemProvider.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ScatterChart3dFXItemProvider.java
new file mode 100644
index 00000000..eac031bb
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/ScatterChart3dFXItemProvider.java
@@ -0,0 +1,106 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart.provider;
+
+import de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
+/**
+ * This is the item provider adapter for a {@link de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ScatterChart3dFXItemProvider extends XYZChartFXItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ScatterChart3dFXItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns ScatterChart3dFX.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ScatterChart3dFX"));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean shouldComposeCreationImage() {
+		return true;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ScatterChart3dFX) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ScatterChart3dFX_type")
+				: getString("_UI_ScatterChart3dFX_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/SeriesFXItemProvider.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/SeriesFXItemProvider.java
index f7fc11bb..e7d9ca63 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/SeriesFXItemProvider.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/SeriesFXItemProvider.java
@@ -209,6 +209,9 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors
 
 		newChildDescriptors.add(createChildParameter(ChartPackage.Literals.SERIES_FX__VALUES,
 				ChartFactory.eINSTANCE.createXYValueFX()));
+
+		newChildDescriptors.add(createChildParameter(ChartPackage.Literals.SERIES_FX__VALUES,
+				ChartFactory.eINSTANCE.createXYZValueFX()));
 	}
 
 	/**
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/XYZChartFXItemProvider.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/XYZChartFXItemProvider.java
new file mode 100644
index 00000000..925cc39f
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/XYZChartFXItemProvider.java
@@ -0,0 +1,139 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart.provider;
+
+import de.dc.javafx.xcore.workbench.chart.ChartFactory;
+import de.dc.javafx.xcore.workbench.chart.ChartPackage;
+import de.dc.javafx.xcore.workbench.chart.XYZChartFX;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link de.dc.javafx.xcore.workbench.chart.XYZChartFX} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class XYZChartFXItemProvider extends ChartFXItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XYZChartFXItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(ChartPackage.Literals.XYZ_CHART_FX__SERIES);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean shouldComposeCreationImage() {
+		return true;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((XYZChartFX) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_XYZChartFX_type")
+				: getString("_UI_XYZChartFX_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(XYZChartFX.class)) {
+		case ChartPackage.XYZ_CHART_FX__SERIES:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add(createChildParameter(ChartPackage.Literals.XYZ_CHART_FX__SERIES,
+				ChartFactory.eINSTANCE.createXYZSeriesFX()));
+	}
+
+}
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/XYZSeriesFXItemProvider.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/XYZSeriesFXItemProvider.java
new file mode 100644
index 00000000..cafdb5a8
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/XYZSeriesFXItemProvider.java
@@ -0,0 +1,224 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart.provider;
+
+import de.dc.javafx.xcore.workbench.chart.ChartFactory;
+import de.dc.javafx.xcore.workbench.chart.ChartPackage;
+import de.dc.javafx.xcore.workbench.chart.XYZSeriesFX;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class XYZSeriesFXItemProvider extends ItemProviderAdapter
+		implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+		IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XYZSeriesFXItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(), getString("_UI_XYZSeriesFX_name_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_XYZSeriesFX_name_feature",
+								"_UI_XYZSeriesFX_type"),
+						ChartPackage.Literals.XYZ_SERIES_FX__NAME, true, false, false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(ChartPackage.Literals.XYZ_SERIES_FX__VALUES);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns XYZSeriesFX.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XYZSeriesFX"));
+	}
+
+	/**
+	 * This returns <code>getImage(object)</code> for the column index <code>0</code> or <code>super.getImage(object)</code> otherwise.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getText(Object)
+	 * @see #getColumnText(Object, int)
+	 * @generated
+	 */
+	@Override
+	public Object getColumnImage(Object object, int columnIndex) {
+		// TODO: implement this method to return appropriate information for each column.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return columnIndex == 0 ? getImage(object) : super.getImage(object);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean shouldComposeCreationImage() {
+		return true;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((XYZSeriesFX) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_XYZSeriesFX_type")
+				: getString("_UI_XYZSeriesFX_type") + " " + label;
+	}
+
+	/**
+	 * This returns <code>getText(object)</code> for the column index <code>0</code> or <code>super.getText(object)</code> otherwise.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getImage(Object)
+	 * @see #getColumnImage(Object, int)
+	 * @generated
+	 */
+	@Override
+	public String getColumnText(Object object, int columnIndex) {
+		// TODO: implement this method to return appropriate information for each column.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return columnIndex == 0 ? getText(object) : super.getText(object);
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(XYZSeriesFX.class)) {
+		case ChartPackage.XYZ_SERIES_FX__NAME:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case ChartPackage.XYZ_SERIES_FX__VALUES:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add(createChildParameter(ChartPackage.Literals.XYZ_SERIES_FX__VALUES,
+				ChartFactory.eINSTANCE.createXYZValueFX()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return ChartEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/XYZValueFXItemProvider.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/XYZValueFXItemProvider.java
new file mode 100644
index 00000000..e7086282
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.edit/src-gen/de/dc/javafx/xcore/workbench/chart/provider/XYZValueFXItemProvider.java
@@ -0,0 +1,131 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart.provider;
+
+import de.dc.javafx.xcore.workbench.chart.ChartPackage;
+import de.dc.javafx.xcore.workbench.chart.XYZValueFX;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link de.dc.javafx.xcore.workbench.chart.XYZValueFX} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class XYZValueFXItemProvider extends XYValueFXItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public XYZValueFXItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addZPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Z feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addZPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(), getString("_UI_XYZValueFX_z_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_XYZValueFX_z_feature",
+								"_UI_XYZValueFX_type"),
+						ChartPackage.Literals.XYZ_VALUE_FX__Z, true, false, false,
+						ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This returns XYZValueFX.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/XYZValueFX"));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean shouldComposeCreationImage() {
+		return true;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		XYZValueFX xyzValueFX = (XYZValueFX) object;
+		return getString("_UI_XYZValueFX_type") + " " + xyzValueFX.getX();
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(XYZValueFX.class)) {
+		case ChartPackage.XYZ_VALUE_FX__Z:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.class
index 13e98d90..6f136f19 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/ChartFXEmfDetailedTreeView.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.class
index 4a8f497f..87240e90 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/bin/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.java
index e9a5857f..527355b4 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart.ui/src/de/dc/javafx/xcore/workbench/chart/ui/renderer/ChartFXRenderer.java
@@ -16,12 +16,17 @@
 import com.orsoncharts.data.DefaultKeyedValues;
 import com.orsoncharts.data.StandardPieDataset3D;
 import com.orsoncharts.data.category.StandardCategoryDataset3D;
+import com.orsoncharts.data.xyz.XYZSeries;
+import com.orsoncharts.data.xyz.XYZSeriesCollection;
 import com.orsoncharts.fx.Chart3DViewer;
 import com.orsoncharts.graphics3d.Dimension3D;
 import com.orsoncharts.graphics3d.ViewPoint3D;
+import com.orsoncharts.label.StandardXYZLabelGenerator;
 import com.orsoncharts.legend.LegendAnchor;
 import com.orsoncharts.plot.CategoryPlot3D;
+import com.orsoncharts.plot.XYZPlot;
 import com.orsoncharts.renderer.category.AreaRenderer3D;
+import com.orsoncharts.renderer.xyz.ScatterXYZRenderer;
 import com.orsoncharts.util.Orientation;
 
 import de.dc.javafx.xcore.lang.lib.chart.BaseAreaChart;
@@ -43,10 +48,13 @@
 import de.dc.javafx.xcore.workbench.chart.LineChartFX;
 import de.dc.javafx.xcore.workbench.chart.PieChart3dFX;
 import de.dc.javafx.xcore.workbench.chart.PieChartFX;
+import de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX;
 import de.dc.javafx.xcore.workbench.chart.ScatterChartFX;
 import de.dc.javafx.xcore.workbench.chart.SeriesFX;
 import de.dc.javafx.xcore.workbench.chart.XYChartFX;
 import de.dc.javafx.xcore.workbench.chart.XYValueFX;
+import de.dc.javafx.xcore.workbench.chart.XYZSeriesFX;
+import de.dc.javafx.xcore.workbench.chart.XYZValueFX;
 import de.dc.javafx.xcore.workbench.chart.util.ChartSwitch;
 import javafx.geometry.Side;
 import javafx.scene.Node;
@@ -61,6 +69,33 @@ public class ChartFXRenderer extends ChartSwitch<Node> {
 
 	private Chart currentChart;
 
+	@Override
+	public Node caseScatterChart3dFX(ScatterChart3dFX object) {
+		XYZSeriesCollection<String> dataset = new XYZSeriesCollection<>();
+		for (XYZSeriesFX seriesFX : object.getSeries()) {
+			String name = seriesFX.getName();
+			XYZSeries<String> series = new XYZSeries<>(name);
+			for (XYZValueFX valueFX : seriesFX.getValues()) {
+				series.add(valueFX.getX(), valueFX.getY(), valueFX.getZ());		
+			}
+			dataset.add(series);
+		}
+		String title = object.getName();
+		String subtitle = "";
+		String xAxisLabel = "X";
+		String yAxisLabel = "Y";
+		String zAxisLabel = "Z";
+		Chart3D chart = Chart3DFactory.createScatterChart(title, subtitle, dataset, xAxisLabel, yAxisLabel, zAxisLabel);
+		XYZPlot plot = (XYZPlot) chart.getPlot();
+		plot.setDimensions(new Dimension3D(10.0, 4.0, 4.0));
+		plot.setLegendLabelGenerator(new StandardXYZLabelGenerator(StandardXYZLabelGenerator.COUNT_TEMPLATE));
+		ScatterXYZRenderer renderer = (ScatterXYZRenderer) plot.getRenderer();
+		renderer.setSize(0.15);
+		renderer.setColors(Colors.createIntenseColors());
+		chart.setViewPoint(ViewPoint3D.createAboveLeftViewPoint(40));
+		return new Chart3DViewer(chart);
+	}
+
 	@Override
 	public Node casePieChart3dFX(PieChart3dFX object) {
 		StandardPieDataset3D<String> dataset = new StandardPieDataset3D<>();
@@ -77,7 +112,7 @@ public Node casePieChart3dFX(PieChart3dFX object) {
 		chart.setLegendPosition(LegendAnchor.BOTTOM_CENTER, Orientation.HORIZONTAL);
 		return new Chart3DViewer(chart);
 	}
-	
+
 	@Override
 	public Node caseLineChart3dFX(LineChart3dFX object) {
 		StandardCategoryDataset3D<String, String, String> dataset = new StandardCategoryDataset3D<>();
@@ -87,24 +122,24 @@ public Node caseLineChart3dFX(LineChart3dFX object) {
 			for (XYValueFX valueFX : serieFX.getValues()) {
 				serie.put(String.valueOf(valueFX.getX()), valueFX.getY());
 			}
-			String seriesName = serieFX.getName()==null? "No name "+series.indexOf(serieFX) : serieFX.getName();
+			String seriesName = serieFX.getName() == null ? "No name " + series.indexOf(serieFX) : serieFX.getName();
 			dataset.addSeriesAsRow(seriesName, serie);
 		}
-		
+
 		String title = object.getName();
 		String subtitle = "";
 		String valueAxisLabel = object.getXAxisLabel();
 		Chart3D chart = Chart3DFactory.createLineChart(title, subtitle, dataset, null, null, valueAxisLabel);
-	    CategoryPlot3D plot = (CategoryPlot3D) chart.getPlot();
-	    plot.setDimensions(new Dimension3D(18, 8, 4));
-	    plot.getRowAxis().setVisible(false);
-	    NumberAxis3D valueAxis = (NumberAxis3D) plot.getValueAxis();
-	    valueAxis.setTickSelector(new NumberTickSelector(true));
-	    plot.getRenderer().setColors(Colors.createFancyDarkColors());
-	    chart.setViewPoint(ViewPoint3D.createAboveViewPoint(30));
-	    return new Chart3DViewer(chart);
+		CategoryPlot3D plot = (CategoryPlot3D) chart.getPlot();
+		plot.setDimensions(new Dimension3D(18, 8, 4));
+		plot.getRowAxis().setVisible(false);
+		NumberAxis3D valueAxis = (NumberAxis3D) plot.getValueAxis();
+		valueAxis.setTickSelector(new NumberTickSelector(true));
+		plot.getRenderer().setColors(Colors.createFancyDarkColors());
+		chart.setViewPoint(ViewPoint3D.createAboveViewPoint(30));
+		return new Chart3DViewer(chart);
 	}
-	
+
 	@Override
 	public Node caseBarChart3dFX(BarChart3dFX object) {
 		StandardCategoryDataset3D<String, String, String> dataset = new StandardCategoryDataset3D<>();
@@ -114,18 +149,18 @@ public Node caseBarChart3dFX(BarChart3dFX object) {
 			for (XYValueFX valueFX : serieFX.getValues()) {
 				serie.put(String.valueOf(valueFX.getX()), valueFX.getY());
 			}
-			String seriesName = serieFX.getName()==null? "No name "+series.indexOf(serieFX) : serieFX.getName();
+			String seriesName = serieFX.getName() == null ? "No name " + series.indexOf(serieFX) : serieFX.getName();
 			dataset.addSeriesAsRow(seriesName, serie);
 		}
 
 		Chart3D chart = Chart3DFactory.createBarChart(object.getName(), "", dataset, null, "Month", "Value");
-	    chart.setChartBoxColor(new Color(255, 255, 255, 127));
-	    chart.setLegendAnchor(LegendAnchor.BOTTOM_RIGHT);
-	    CategoryPlot3D plot = (CategoryPlot3D) chart.getPlot();
-	    plot.setGridlinePaintForValues(Color.BLACK);
-	    return new Chart3DViewer(chart);
+		chart.setChartBoxColor(new Color(255, 255, 255, 127));
+		chart.setLegendAnchor(LegendAnchor.BOTTOM_RIGHT);
+		CategoryPlot3D plot = (CategoryPlot3D) chart.getPlot();
+		plot.setGridlinePaintForValues(Color.BLACK);
+		return new Chart3DViewer(chart);
 	}
-	
+
 	@Override
 	public Node caseAreaChart3dFX(AreaChart3dFX object) {
 		StandardCategoryDataset3D<String, String, String> dataset = new StandardCategoryDataset3D<>();
@@ -135,7 +170,7 @@ public Node caseAreaChart3dFX(AreaChart3dFX object) {
 			for (XYValueFX valueFX : serieFX.getValues()) {
 				serie.put(String.valueOf(valueFX.getX()), valueFX.getY());
 			}
-			String name = serieFX.getName()==null? "No Name "+series.indexOf(serieFX) : serieFX.getName();
+			String name = serieFX.getName() == null ? "No Name " + series.indexOf(serieFX) : serieFX.getName();
 			dataset.addSeriesAsRow(name, serie);
 		}
 
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartFactory.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartFactory.class
index 6c93522b..243acee2 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartFactory.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartFactory.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartPackage$Literals.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartPackage$Literals.class
index bbae9dd8..d45e1e15 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartPackage$Literals.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartPackage$Literals.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartPackage.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartPackage.class
index 3893315f..f0ea935a 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartPackage.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ChartPackage.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ScatterChart3dFX.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ScatterChart3dFX.class
new file mode 100644
index 00000000..f88c73f5
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/ScatterChart3dFX.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/XYZChartFX.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/XYZChartFX.class
new file mode 100644
index 00000000..9bccda13
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/XYZChartFX.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/XYZSeriesFX.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/XYZSeriesFX.class
new file mode 100644
index 00000000..1a7e155a
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/XYZSeriesFX.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/XYZValueFX.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/XYZValueFX.class
new file mode 100644
index 00000000..0d0fa360
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/XYZValueFX.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ChartFactoryImpl.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ChartFactoryImpl.class
index 1e345fcd..20b0c018 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ChartFactoryImpl.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ChartFactoryImpl.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ChartPackageImpl.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ChartPackageImpl.class
index 7921d3f8..8356991a 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ChartPackageImpl.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ChartPackageImpl.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ScatterChart3dFXImpl.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ScatterChart3dFXImpl.class
new file mode 100644
index 00000000..a9963a16
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/ScatterChart3dFXImpl.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/XYZChartFXImpl.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/XYZChartFXImpl.class
new file mode 100644
index 00000000..9e2f63a5
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/XYZChartFXImpl.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/XYZSeriesFXImpl.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/XYZSeriesFXImpl.class
new file mode 100644
index 00000000..05940174
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/XYZSeriesFXImpl.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/XYZValueFXImpl.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/XYZValueFXImpl.class
new file mode 100644
index 00000000..85255312
Binary files /dev/null and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/impl/XYZValueFXImpl.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory$1.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory$1.class
index 9698e2fe..248f75a8 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory$1.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory$1.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory.class
index 2257d096..361058aa 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartSwitch.class b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartSwitch.class
index 8d978fb9..d69d9b17 100644
Binary files a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartSwitch.class and b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/bin/de/dc/javafx/xcore/workbench/chart/util/ChartSwitch.class differ
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/model/chart.xcore b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/model/chart.xcore
index ed9f0574..fdf90f1b 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/model/chart.xcore
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/model/chart.xcore
@@ -32,6 +32,15 @@ abstract class CategoryChartFX extends ChartFX{
 	contains CategorySeriesFX[0..*] series
 }
 
+abstract class XYZChartFX extends ChartFX{
+	contains XYZSeriesFX[0..*] series
+}
+
+class XYZSeriesFX{
+	String name
+	contains XYZValueFX[0..*] values
+}
+
 class CategorySeriesFX{
 	String name
 	contains CategoryValueFX[0..*] values
@@ -47,6 +56,10 @@ class XYValueFX{
 	double y = '0'
 }
 
+class XYZValueFX extends XYValueFX{
+	double z = '0'
+}
+
 class CategoryValueFX{
 	String name = ''
 	double value ='0'
@@ -64,6 +77,7 @@ class AreaChart3dFX extends XYChartFX{}
 class BarChart3dFX extends XYChartFX{}
 class LineChart3dFX extends XYChartFX{}
 class PieChart3dFX extends CategoryChartFX{}
+class ScatterChart3dFX extends XYZChartFX{}
 
 class ChartFXConfig{
 	ChartSide sideLegend
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ChartFactory.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ChartFactory.java
index a1ea6b41..bcb54338 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ChartFactory.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ChartFactory.java
@@ -30,6 +30,15 @@ public interface ChartFactory extends EFactory {
 	 */
 	ChartProject createChartProject();
 
+	/**
+	 * Returns a new object of class '<em>XYZ Series FX</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>XYZ Series FX</em>'.
+	 * @generated
+	 */
+	XYZSeriesFX createXYZSeriesFX();
+
 	/**
 	 * Returns a new object of class '<em>Category Series FX</em>'.
 	 * <!-- begin-user-doc -->
@@ -57,6 +66,15 @@ public interface ChartFactory extends EFactory {
 	 */
 	XYValueFX createXYValueFX();
 
+	/**
+	 * Returns a new object of class '<em>XYZ Value FX</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>XYZ Value FX</em>'.
+	 * @generated
+	 */
+	XYZValueFX createXYZValueFX();
+
 	/**
 	 * Returns a new object of class '<em>Category Value FX</em>'.
 	 * <!-- begin-user-doc -->
@@ -156,6 +174,15 @@ public interface ChartFactory extends EFactory {
 	 */
 	PieChart3dFX createPieChart3dFX();
 
+	/**
+	 * Returns a new object of class '<em>Scatter Chart3d FX</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Scatter Chart3d FX</em>'.
+	 * @generated
+	 */
+	ScatterChart3dFX createScatterChart3dFX();
+
 	/**
 	 * Returns a new object of class '<em>FX Config</em>'.
 	 * <!-- begin-user-doc -->
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ChartPackage.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ChartPackage.java
index 2f9e511f..417aa6f9 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ChartPackage.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ChartPackage.java
@@ -341,6 +341,134 @@ public interface ChartPackage extends EPackage {
 	 */
 	int CATEGORY_CHART_FX_OPERATION_COUNT = CHART_FX_OPERATION_COUNT + 0;
 
+	/**
+	 * The meta object id for the '{@link de.dc.javafx.xcore.workbench.chart.impl.XYZChartFXImpl <em>XYZ Chart FX</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.dc.javafx.xcore.workbench.chart.impl.XYZChartFXImpl
+	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getXYZChartFX()
+	 * @generated
+	 */
+	int XYZ_CHART_FX = 4;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_CHART_FX__NAME = CHART_FX__NAME;
+
+	/**
+	 * The feature id for the '<em><b>XAxis Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_CHART_FX__XAXIS_LABEL = CHART_FX__XAXIS_LABEL;
+
+	/**
+	 * The feature id for the '<em><b>YAxis Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_CHART_FX__YAXIS_LABEL = CHART_FX__YAXIS_LABEL;
+
+	/**
+	 * The feature id for the '<em><b>ZAxis Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_CHART_FX__ZAXIS_LABEL = CHART_FX__ZAXIS_LABEL;
+
+	/**
+	 * The feature id for the '<em><b>Config</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_CHART_FX__CONFIG = CHART_FX__CONFIG;
+
+	/**
+	 * The feature id for the '<em><b>Series</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_CHART_FX__SERIES = CHART_FX_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>XYZ Chart FX</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_CHART_FX_FEATURE_COUNT = CHART_FX_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>XYZ Chart FX</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_CHART_FX_OPERATION_COUNT = CHART_FX_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link de.dc.javafx.xcore.workbench.chart.impl.XYZSeriesFXImpl <em>XYZ Series FX</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.dc.javafx.xcore.workbench.chart.impl.XYZSeriesFXImpl
+	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getXYZSeriesFX()
+	 * @generated
+	 */
+	int XYZ_SERIES_FX = 5;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_SERIES_FX__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Values</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_SERIES_FX__VALUES = 1;
+
+	/**
+	 * The number of structural features of the '<em>XYZ Series FX</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_SERIES_FX_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>XYZ Series FX</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_SERIES_FX_OPERATION_COUNT = 0;
+
 	/**
 	 * The meta object id for the '{@link de.dc.javafx.xcore.workbench.chart.impl.CategorySeriesFXImpl <em>Category Series FX</em>}' class.
 	 * <!-- begin-user-doc -->
@@ -349,7 +477,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getCategorySeriesFX()
 	 * @generated
 	 */
-	int CATEGORY_SERIES_FX = 4;
+	int CATEGORY_SERIES_FX = 6;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -395,7 +523,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getSeriesFX()
 	 * @generated
 	 */
-	int SERIES_FX = 5;
+	int SERIES_FX = 7;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -441,7 +569,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getXYValueFX()
 	 * @generated
 	 */
-	int XY_VALUE_FX = 6;
+	int XY_VALUE_FX = 8;
 
 	/**
 	 * The feature id for the '<em><b>X</b></em>' attribute.
@@ -479,6 +607,61 @@ public interface ChartPackage extends EPackage {
 	 */
 	int XY_VALUE_FX_OPERATION_COUNT = 0;
 
+	/**
+	 * The meta object id for the '{@link de.dc.javafx.xcore.workbench.chart.impl.XYZValueFXImpl <em>XYZ Value FX</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.dc.javafx.xcore.workbench.chart.impl.XYZValueFXImpl
+	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getXYZValueFX()
+	 * @generated
+	 */
+	int XYZ_VALUE_FX = 9;
+
+	/**
+	 * The feature id for the '<em><b>X</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_VALUE_FX__X = XY_VALUE_FX__X;
+
+	/**
+	 * The feature id for the '<em><b>Y</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_VALUE_FX__Y = XY_VALUE_FX__Y;
+
+	/**
+	 * The feature id for the '<em><b>Z</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_VALUE_FX__Z = XY_VALUE_FX_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>XYZ Value FX</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_VALUE_FX_FEATURE_COUNT = XY_VALUE_FX_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>XYZ Value FX</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XYZ_VALUE_FX_OPERATION_COUNT = XY_VALUE_FX_OPERATION_COUNT + 0;
+
 	/**
 	 * The meta object id for the '{@link de.dc.javafx.xcore.workbench.chart.impl.CategoryValueFXImpl <em>Category Value FX</em>}' class.
 	 * <!-- begin-user-doc -->
@@ -487,7 +670,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getCategoryValueFX()
 	 * @generated
 	 */
-	int CATEGORY_VALUE_FX = 7;
+	int CATEGORY_VALUE_FX = 10;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -533,7 +716,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getLineChartFX()
 	 * @generated
 	 */
-	int LINE_CHART_FX = 8;
+	int LINE_CHART_FX = 11;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -615,7 +798,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getAreaChartFX()
 	 * @generated
 	 */
-	int AREA_CHART_FX = 9;
+	int AREA_CHART_FX = 12;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -697,7 +880,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getScatterChartFX()
 	 * @generated
 	 */
-	int SCATTER_CHART_FX = 10;
+	int SCATTER_CHART_FX = 13;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -779,7 +962,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getBubbleChartFX()
 	 * @generated
 	 */
-	int BUBBLE_CHART_FX = 11;
+	int BUBBLE_CHART_FX = 14;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -861,7 +1044,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getBarChartFX()
 	 * @generated
 	 */
-	int BAR_CHART_FX = 12;
+	int BAR_CHART_FX = 15;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -943,7 +1126,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getPieChartFX()
 	 * @generated
 	 */
-	int PIE_CHART_FX = 13;
+	int PIE_CHART_FX = 16;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1025,7 +1208,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getAreaChart3dFX()
 	 * @generated
 	 */
-	int AREA_CHART3D_FX = 14;
+	int AREA_CHART3D_FX = 17;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1107,7 +1290,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getBarChart3dFX()
 	 * @generated
 	 */
-	int BAR_CHART3D_FX = 15;
+	int BAR_CHART3D_FX = 18;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1189,7 +1372,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getLineChart3dFX()
 	 * @generated
 	 */
-	int LINE_CHART3D_FX = 16;
+	int LINE_CHART3D_FX = 19;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1271,7 +1454,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getPieChart3dFX()
 	 * @generated
 	 */
-	int PIE_CHART3D_FX = 17;
+	int PIE_CHART3D_FX = 20;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1345,6 +1528,88 @@ public interface ChartPackage extends EPackage {
 	 */
 	int PIE_CHART3D_FX_OPERATION_COUNT = CATEGORY_CHART_FX_OPERATION_COUNT + 0;
 
+	/**
+	 * The meta object id for the '{@link de.dc.javafx.xcore.workbench.chart.impl.ScatterChart3dFXImpl <em>Scatter Chart3d FX</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.dc.javafx.xcore.workbench.chart.impl.ScatterChart3dFXImpl
+	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getScatterChart3dFX()
+	 * @generated
+	 */
+	int SCATTER_CHART3D_FX = 21;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCATTER_CHART3D_FX__NAME = XYZ_CHART_FX__NAME;
+
+	/**
+	 * The feature id for the '<em><b>XAxis Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCATTER_CHART3D_FX__XAXIS_LABEL = XYZ_CHART_FX__XAXIS_LABEL;
+
+	/**
+	 * The feature id for the '<em><b>YAxis Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCATTER_CHART3D_FX__YAXIS_LABEL = XYZ_CHART_FX__YAXIS_LABEL;
+
+	/**
+	 * The feature id for the '<em><b>ZAxis Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCATTER_CHART3D_FX__ZAXIS_LABEL = XYZ_CHART_FX__ZAXIS_LABEL;
+
+	/**
+	 * The feature id for the '<em><b>Config</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCATTER_CHART3D_FX__CONFIG = XYZ_CHART_FX__CONFIG;
+
+	/**
+	 * The feature id for the '<em><b>Series</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCATTER_CHART3D_FX__SERIES = XYZ_CHART_FX__SERIES;
+
+	/**
+	 * The number of structural features of the '<em>Scatter Chart3d FX</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCATTER_CHART3D_FX_FEATURE_COUNT = XYZ_CHART_FX_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Scatter Chart3d FX</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SCATTER_CHART3D_FX_OPERATION_COUNT = XYZ_CHART_FX_OPERATION_COUNT + 0;
+
 	/**
 	 * The meta object id for the '{@link de.dc.javafx.xcore.workbench.chart.impl.ChartFXConfigImpl <em>FX Config</em>}' class.
 	 * <!-- begin-user-doc -->
@@ -1353,7 +1618,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getChartFXConfig()
 	 * @generated
 	 */
-	int CHART_FX_CONFIG = 18;
+	int CHART_FX_CONFIG = 22;
 
 	/**
 	 * The feature id for the '<em><b>Side Legend</b></em>' attribute.
@@ -1471,7 +1736,7 @@ public interface ChartPackage extends EPackage {
 	 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getChartSide()
 	 * @generated
 	 */
-	int CHART_SIDE = 19;
+	int CHART_SIDE = 23;
 
 	/**
 	 * Returns the meta object for class '{@link de.dc.javafx.xcore.workbench.chart.ChartProject <em>Project</em>}'.
@@ -1612,6 +1877,59 @@ public interface ChartPackage extends EPackage {
 	 */
 	EReference getCategoryChartFX_Series();
 
+	/**
+	 * Returns the meta object for class '{@link de.dc.javafx.xcore.workbench.chart.XYZChartFX <em>XYZ Chart FX</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>XYZ Chart FX</em>'.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZChartFX
+	 * @generated
+	 */
+	EClass getXYZChartFX();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link de.dc.javafx.xcore.workbench.chart.XYZChartFX#getSeries <em>Series</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Series</em>'.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZChartFX#getSeries()
+	 * @see #getXYZChartFX()
+	 * @generated
+	 */
+	EReference getXYZChartFX_Series();
+
+	/**
+	 * Returns the meta object for class '{@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX <em>XYZ Series FX</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>XYZ Series FX</em>'.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZSeriesFX
+	 * @generated
+	 */
+	EClass getXYZSeriesFX();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZSeriesFX#getName()
+	 * @see #getXYZSeriesFX()
+	 * @generated
+	 */
+	EAttribute getXYZSeriesFX_Name();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX#getValues <em>Values</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Values</em>'.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZSeriesFX#getValues()
+	 * @see #getXYZSeriesFX()
+	 * @generated
+	 */
+	EReference getXYZSeriesFX_Values();
+
 	/**
 	 * Returns the meta object for class '{@link de.dc.javafx.xcore.workbench.chart.CategorySeriesFX <em>Category Series FX</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1708,6 +2026,27 @@ public interface ChartPackage extends EPackage {
 	 */
 	EAttribute getXYValueFX_Y();
 
+	/**
+	 * Returns the meta object for class '{@link de.dc.javafx.xcore.workbench.chart.XYZValueFX <em>XYZ Value FX</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>XYZ Value FX</em>'.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZValueFX
+	 * @generated
+	 */
+	EClass getXYZValueFX();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.dc.javafx.xcore.workbench.chart.XYZValueFX#getZ <em>Z</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Z</em>'.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZValueFX#getZ()
+	 * @see #getXYZValueFX()
+	 * @generated
+	 */
+	EAttribute getXYZValueFX_Z();
+
 	/**
 	 * Returns the meta object for class '{@link de.dc.javafx.xcore.workbench.chart.CategoryValueFX <em>Category Value FX</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1840,6 +2179,16 @@ public interface ChartPackage extends EPackage {
 	 */
 	EClass getPieChart3dFX();
 
+	/**
+	 * Returns the meta object for class '{@link de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX <em>Scatter Chart3d FX</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Scatter Chart3d FX</em>'.
+	 * @see de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX
+	 * @generated
+	 */
+	EClass getScatterChart3dFX();
+
 	/**
 	 * Returns the meta object for class '{@link de.dc.javafx.xcore.workbench.chart.ChartFXConfig <em>FX Config</em>}'.
 	 * <!-- begin-user-doc -->
@@ -2105,6 +2454,50 @@ interface Literals {
 		 */
 		EReference CATEGORY_CHART_FX__SERIES = eINSTANCE.getCategoryChartFX_Series();
 
+		/**
+		 * The meta object literal for the '{@link de.dc.javafx.xcore.workbench.chart.impl.XYZChartFXImpl <em>XYZ Chart FX</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.dc.javafx.xcore.workbench.chart.impl.XYZChartFXImpl
+		 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getXYZChartFX()
+		 * @generated
+		 */
+		EClass XYZ_CHART_FX = eINSTANCE.getXYZChartFX();
+
+		/**
+		 * The meta object literal for the '<em><b>Series</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XYZ_CHART_FX__SERIES = eINSTANCE.getXYZChartFX_Series();
+
+		/**
+		 * The meta object literal for the '{@link de.dc.javafx.xcore.workbench.chart.impl.XYZSeriesFXImpl <em>XYZ Series FX</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.dc.javafx.xcore.workbench.chart.impl.XYZSeriesFXImpl
+		 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getXYZSeriesFX()
+		 * @generated
+		 */
+		EClass XYZ_SERIES_FX = eINSTANCE.getXYZSeriesFX();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XYZ_SERIES_FX__NAME = eINSTANCE.getXYZSeriesFX_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Values</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference XYZ_SERIES_FX__VALUES = eINSTANCE.getXYZSeriesFX_Values();
+
 		/**
 		 * The meta object literal for the '{@link de.dc.javafx.xcore.workbench.chart.impl.CategorySeriesFXImpl <em>Category Series FX</em>}' class.
 		 * <!-- begin-user-doc -->
@@ -2183,6 +2576,24 @@ interface Literals {
 		 */
 		EAttribute XY_VALUE_FX__Y = eINSTANCE.getXYValueFX_Y();
 
+		/**
+		 * The meta object literal for the '{@link de.dc.javafx.xcore.workbench.chart.impl.XYZValueFXImpl <em>XYZ Value FX</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.dc.javafx.xcore.workbench.chart.impl.XYZValueFXImpl
+		 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getXYZValueFX()
+		 * @generated
+		 */
+		EClass XYZ_VALUE_FX = eINSTANCE.getXYZValueFX();
+
+		/**
+		 * The meta object literal for the '<em><b>Z</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute XYZ_VALUE_FX__Z = eINSTANCE.getXYZValueFX_Z();
+
 		/**
 		 * The meta object literal for the '{@link de.dc.javafx.xcore.workbench.chart.impl.CategoryValueFXImpl <em>Category Value FX</em>}' class.
 		 * <!-- begin-user-doc -->
@@ -2309,6 +2720,16 @@ interface Literals {
 		 */
 		EClass PIE_CHART3D_FX = eINSTANCE.getPieChart3dFX();
 
+		/**
+		 * The meta object literal for the '{@link de.dc.javafx.xcore.workbench.chart.impl.ScatterChart3dFXImpl <em>Scatter Chart3d FX</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.dc.javafx.xcore.workbench.chart.impl.ScatterChart3dFXImpl
+		 * @see de.dc.javafx.xcore.workbench.chart.impl.ChartPackageImpl#getScatterChart3dFX()
+		 * @generated
+		 */
+		EClass SCATTER_CHART3D_FX = eINSTANCE.getScatterChart3dFX();
+
 		/**
 		 * The meta object literal for the '{@link de.dc.javafx.xcore.workbench.chart.impl.ChartFXConfigImpl <em>FX Config</em>}' class.
 		 * <!-- begin-user-doc -->
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ScatterChart3dFX.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ScatterChart3dFX.java
new file mode 100644
index 00000000..1468ab0e
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/ScatterChart3dFX.java
@@ -0,0 +1,16 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Scatter Chart3d FX</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see de.dc.javafx.xcore.workbench.chart.ChartPackage#getScatterChart3dFX()
+ * @model
+ * @generated
+ */
+public interface ScatterChart3dFX extends XYZChartFX {
+} // ScatterChart3dFX
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/XYZChartFX.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/XYZChartFX.java
new file mode 100644
index 00000000..c539f856
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/XYZChartFX.java
@@ -0,0 +1,36 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>XYZ Chart FX</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link de.dc.javafx.xcore.workbench.chart.XYZChartFX#getSeries <em>Series</em>}</li>
+ * </ul>
+ *
+ * @see de.dc.javafx.xcore.workbench.chart.ChartPackage#getXYZChartFX()
+ * @model abstract="true"
+ * @generated
+ */
+public interface XYZChartFX extends ChartFX {
+	/**
+	 * Returns the value of the '<em><b>Series</b></em>' containment reference list.
+	 * The list contents are of type {@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Series</em>' containment reference list.
+	 * @see de.dc.javafx.xcore.workbench.chart.ChartPackage#getXYZChartFX_Series()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<XYZSeriesFX> getSeries();
+
+} // XYZChartFX
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/XYZSeriesFX.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/XYZSeriesFX.java
new file mode 100644
index 00000000..6b0ab877
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/XYZSeriesFX.java
@@ -0,0 +1,61 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>XYZ Series FX</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX#getName <em>Name</em>}</li>
+ *   <li>{@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX#getValues <em>Values</em>}</li>
+ * </ul>
+ *
+ * @see de.dc.javafx.xcore.workbench.chart.ChartPackage#getXYZSeriesFX()
+ * @model
+ * @generated
+ */
+public interface XYZSeriesFX extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see de.dc.javafx.xcore.workbench.chart.ChartPackage#getXYZSeriesFX_Name()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Values</b></em>' containment reference list.
+	 * The list contents are of type {@link de.dc.javafx.xcore.workbench.chart.XYZValueFX}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Values</em>' containment reference list.
+	 * @see de.dc.javafx.xcore.workbench.chart.ChartPackage#getXYZSeriesFX_Values()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<XYZValueFX> getValues();
+
+} // XYZSeriesFX
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/XYZValueFX.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/XYZValueFX.java
new file mode 100644
index 00000000..c09a6e63
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/XYZValueFX.java
@@ -0,0 +1,45 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>XYZ Value FX</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link de.dc.javafx.xcore.workbench.chart.XYZValueFX#getZ <em>Z</em>}</li>
+ * </ul>
+ *
+ * @see de.dc.javafx.xcore.workbench.chart.ChartPackage#getXYZValueFX()
+ * @model
+ * @generated
+ */
+public interface XYZValueFX extends XYValueFX {
+	/**
+	 * Returns the value of the '<em><b>Z</b></em>' attribute.
+	 * The default value is <code>"0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Z</em>' attribute.
+	 * @see #setZ(double)
+	 * @see de.dc.javafx.xcore.workbench.chart.ChartPackage#getXYZValueFX_Z()
+	 * @model default="0" unique="false"
+	 * @generated
+	 */
+	double getZ();
+
+	/**
+	 * Sets the value of the '{@link de.dc.javafx.xcore.workbench.chart.XYZValueFX#getZ <em>Z</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Z</em>' attribute.
+	 * @see #getZ()
+	 * @generated
+	 */
+	void setZ(double value);
+
+} // XYZValueFX
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ChartFactoryImpl.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ChartFactoryImpl.java
index 17b0bba0..8535ad43 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ChartFactoryImpl.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ChartFactoryImpl.java
@@ -58,12 +58,16 @@ public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
 		case ChartPackage.CHART_PROJECT:
 			return createChartProject();
+		case ChartPackage.XYZ_SERIES_FX:
+			return createXYZSeriesFX();
 		case ChartPackage.CATEGORY_SERIES_FX:
 			return createCategorySeriesFX();
 		case ChartPackage.SERIES_FX:
 			return createSeriesFX();
 		case ChartPackage.XY_VALUE_FX:
 			return createXYValueFX();
+		case ChartPackage.XYZ_VALUE_FX:
+			return createXYZValueFX();
 		case ChartPackage.CATEGORY_VALUE_FX:
 			return createCategoryValueFX();
 		case ChartPackage.LINE_CHART_FX:
@@ -86,6 +90,8 @@ public EObject create(EClass eClass) {
 			return createLineChart3dFX();
 		case ChartPackage.PIE_CHART3D_FX:
 			return createPieChart3dFX();
+		case ChartPackage.SCATTER_CHART3D_FX:
+			return createScatterChart3dFX();
 		case ChartPackage.CHART_FX_CONFIG:
 			return createChartFXConfig();
 		default:
@@ -134,6 +140,17 @@ public ChartProject createChartProject() {
 		return chartProject;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public XYZSeriesFX createXYZSeriesFX() {
+		XYZSeriesFXImpl xyzSeriesFX = new XYZSeriesFXImpl();
+		return xyzSeriesFX;
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -167,6 +184,17 @@ public XYValueFX createXYValueFX() {
 		return xyValueFX;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public XYZValueFX createXYZValueFX() {
+		XYZValueFXImpl xyzValueFX = new XYZValueFXImpl();
+		return xyzValueFX;
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -288,6 +316,17 @@ public PieChart3dFX createPieChart3dFX() {
 		return pieChart3dFX;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ScatterChart3dFX createScatterChart3dFX() {
+		ScatterChart3dFXImpl scatterChart3dFX = new ScatterChart3dFXImpl();
+		return scatterChart3dFX;
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ChartPackageImpl.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ChartPackageImpl.java
index 86117c7a..478c43c6 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ChartPackageImpl.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ChartPackageImpl.java
@@ -20,10 +20,14 @@
 import de.dc.javafx.xcore.workbench.chart.LineChartFX;
 import de.dc.javafx.xcore.workbench.chart.PieChart3dFX;
 import de.dc.javafx.xcore.workbench.chart.PieChartFX;
+import de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX;
 import de.dc.javafx.xcore.workbench.chart.ScatterChartFX;
 import de.dc.javafx.xcore.workbench.chart.SeriesFX;
 import de.dc.javafx.xcore.workbench.chart.XYChartFX;
 import de.dc.javafx.xcore.workbench.chart.XYValueFX;
+import de.dc.javafx.xcore.workbench.chart.XYZChartFX;
+import de.dc.javafx.xcore.workbench.chart.XYZSeriesFX;
+import de.dc.javafx.xcore.workbench.chart.XYZValueFX;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -69,6 +73,20 @@ public class ChartPackageImpl extends EPackageImpl implements ChartPackage {
 	 */
 	private EClass categoryChartFXEClass = null;
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass xyzChartFXEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass xyzSeriesFXEClass = null;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -90,6 +108,13 @@ public class ChartPackageImpl extends EPackageImpl implements ChartPackage {
 	 */
 	private EClass xyValueFXEClass = null;
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass xyzValueFXEClass = null;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -167,6 +192,13 @@ public class ChartPackageImpl extends EPackageImpl implements ChartPackage {
 	 */
 	private EClass pieChart3dFXEClass = null;
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass scatterChart3dFXEClass = null;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -378,6 +410,56 @@ public EReference getCategoryChartFX_Series() {
 		return (EReference) categoryChartFXEClass.getEStructuralFeatures().get(0);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getXYZChartFX() {
+		return xyzChartFXEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getXYZChartFX_Series() {
+		return (EReference) xyzChartFXEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getXYZSeriesFX() {
+		return xyzSeriesFXEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getXYZSeriesFX_Name() {
+		return (EAttribute) xyzSeriesFXEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getXYZSeriesFX_Values() {
+		return (EReference) xyzSeriesFXEClass.getEStructuralFeatures().get(1);
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -468,6 +550,26 @@ public EAttribute getXYValueFX_Y() {
 		return (EAttribute) xyValueFXEClass.getEStructuralFeatures().get(1);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getXYZValueFX() {
+		return xyzValueFXEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getXYZValueFX_Z() {
+		return (EAttribute) xyzValueFXEClass.getEStructuralFeatures().get(0);
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -598,6 +700,16 @@ public EClass getPieChart3dFX() {
 		return pieChart3dFXEClass;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getScatterChart3dFX() {
+		return scatterChart3dFXEClass;
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -765,6 +877,13 @@ public void createPackageContents() {
 		categoryChartFXEClass = createEClass(CATEGORY_CHART_FX);
 		createEReference(categoryChartFXEClass, CATEGORY_CHART_FX__SERIES);
 
+		xyzChartFXEClass = createEClass(XYZ_CHART_FX);
+		createEReference(xyzChartFXEClass, XYZ_CHART_FX__SERIES);
+
+		xyzSeriesFXEClass = createEClass(XYZ_SERIES_FX);
+		createEAttribute(xyzSeriesFXEClass, XYZ_SERIES_FX__NAME);
+		createEReference(xyzSeriesFXEClass, XYZ_SERIES_FX__VALUES);
+
 		categorySeriesFXEClass = createEClass(CATEGORY_SERIES_FX);
 		createEAttribute(categorySeriesFXEClass, CATEGORY_SERIES_FX__NAME);
 		createEReference(categorySeriesFXEClass, CATEGORY_SERIES_FX__VALUES);
@@ -777,6 +896,9 @@ public void createPackageContents() {
 		createEAttribute(xyValueFXEClass, XY_VALUE_FX__X);
 		createEAttribute(xyValueFXEClass, XY_VALUE_FX__Y);
 
+		xyzValueFXEClass = createEClass(XYZ_VALUE_FX);
+		createEAttribute(xyzValueFXEClass, XYZ_VALUE_FX__Z);
+
 		categoryValueFXEClass = createEClass(CATEGORY_VALUE_FX);
 		createEAttribute(categoryValueFXEClass, CATEGORY_VALUE_FX__NAME);
 		createEAttribute(categoryValueFXEClass, CATEGORY_VALUE_FX__VALUE);
@@ -801,6 +923,8 @@ public void createPackageContents() {
 
 		pieChart3dFXEClass = createEClass(PIE_CHART3D_FX);
 
+		scatterChart3dFXEClass = createEClass(SCATTER_CHART3D_FX);
+
 		chartFXConfigEClass = createEClass(CHART_FX_CONFIG);
 		createEAttribute(chartFXConfigEClass, CHART_FX_CONFIG__SIDE_LEGEND);
 		createEAttribute(chartFXConfigEClass, CHART_FX_CONFIG__TITLE_SIDE);
@@ -851,6 +975,8 @@ public void initializePackageContents() {
 		// Add supertypes to classes
 		xyChartFXEClass.getESuperTypes().add(this.getChartFX());
 		categoryChartFXEClass.getESuperTypes().add(this.getChartFX());
+		xyzChartFXEClass.getESuperTypes().add(this.getChartFX());
+		xyzValueFXEClass.getESuperTypes().add(this.getXYValueFX());
 		lineChartFXEClass.getESuperTypes().add(this.getXYChartFX());
 		areaChartFXEClass.getESuperTypes().add(this.getXYChartFX());
 		scatterChartFXEClass.getESuperTypes().add(this.getXYChartFX());
@@ -861,6 +987,7 @@ public void initializePackageContents() {
 		barChart3dFXEClass.getESuperTypes().add(this.getXYChartFX());
 		lineChart3dFXEClass.getESuperTypes().add(this.getXYChartFX());
 		pieChart3dFXEClass.getESuperTypes().add(this.getCategoryChartFX());
+		scatterChart3dFXEClass.getESuperTypes().add(this.getXYZChartFX());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(chartProjectEClass, ChartProject.class, "ChartProject", !IS_ABSTRACT, !IS_INTERFACE,
@@ -901,6 +1028,21 @@ public void initializePackageContents() {
 				CategoryChartFX.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
 				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(xyzChartFXEClass, XYZChartFX.class, "XYZChartFX", IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getXYZChartFX_Series(), this.getXYZSeriesFX(), null, "series", null, 0, -1, XYZChartFX.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(xyzSeriesFXEClass, XYZSeriesFX.class, "XYZSeriesFX", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getXYZSeriesFX_Name(), theEcorePackage.getEString(), "name", null, 0, 1, XYZSeriesFX.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getXYZSeriesFX_Values(), this.getXYZValueFX(), null, "values", null, 0, -1, XYZSeriesFX.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(categorySeriesFXEClass, CategorySeriesFX.class, "CategorySeriesFX", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getCategorySeriesFX_Name(), theEcorePackage.getEString(), "name", null, 0, 1,
@@ -926,6 +1068,11 @@ public void initializePackageContents() {
 		initEAttribute(getXYValueFX_Y(), theEcorePackage.getEDouble(), "y", "0", 0, 1, XYValueFX.class, !IS_TRANSIENT,
 				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(xyzValueFXEClass, XYZValueFX.class, "XYZValueFX", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getXYZValueFX_Z(), theEcorePackage.getEDouble(), "z", "0", 0, 1, XYZValueFX.class, !IS_TRANSIENT,
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(categoryValueFXEClass, CategoryValueFX.class, "CategoryValueFX", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getCategoryValueFX_Name(), theEcorePackage.getEString(), "name", "", 0, 1, CategoryValueFX.class,
@@ -965,6 +1112,9 @@ public void initializePackageContents() {
 		initEClass(pieChart3dFXEClass, PieChart3dFX.class, "PieChart3dFX", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
 
+		initEClass(scatterChart3dFXEClass, ScatterChart3dFX.class, "ScatterChart3dFX", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+
 		initEClass(chartFXConfigEClass, ChartFXConfig.class, "ChartFXConfig", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getChartFXConfig_SideLegend(), this.getChartSide(), "sideLegend", null, 0, 1,
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ScatterChart3dFXImpl.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ScatterChart3dFXImpl.java
new file mode 100644
index 00000000..5bef12a5
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/ScatterChart3dFXImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart.impl;
+
+import de.dc.javafx.xcore.workbench.chart.ChartPackage;
+import de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Scatter Chart3d FX</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ScatterChart3dFXImpl extends XYZChartFXImpl implements ScatterChart3dFX {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ScatterChart3dFXImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ChartPackage.Literals.SCATTER_CHART3D_FX;
+	}
+
+} //ScatterChart3dFXImpl
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/XYZChartFXImpl.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/XYZChartFXImpl.java
new file mode 100644
index 00000000..3a6dcd5b
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/XYZChartFXImpl.java
@@ -0,0 +1,152 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart.impl;
+
+import de.dc.javafx.xcore.workbench.chart.ChartPackage;
+import de.dc.javafx.xcore.workbench.chart.XYZChartFX;
+import de.dc.javafx.xcore.workbench.chart.XYZSeriesFX;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>XYZ Chart FX</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link de.dc.javafx.xcore.workbench.chart.impl.XYZChartFXImpl#getSeries <em>Series</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class XYZChartFXImpl extends ChartFXImpl implements XYZChartFX {
+	/**
+	 * The cached value of the '{@link #getSeries() <em>Series</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeries()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<XYZSeriesFX> series;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XYZChartFXImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ChartPackage.Literals.XYZ_CHART_FX;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<XYZSeriesFX> getSeries() {
+		if (series == null) {
+			series = new EObjectContainmentEList<XYZSeriesFX>(XYZSeriesFX.class, this,
+					ChartPackage.XYZ_CHART_FX__SERIES);
+		}
+		return series;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ChartPackage.XYZ_CHART_FX__SERIES:
+			return ((InternalEList<?>) getSeries()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case ChartPackage.XYZ_CHART_FX__SERIES:
+			return getSeries();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ChartPackage.XYZ_CHART_FX__SERIES:
+			getSeries().clear();
+			getSeries().addAll((Collection<? extends XYZSeriesFX>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ChartPackage.XYZ_CHART_FX__SERIES:
+			getSeries().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ChartPackage.XYZ_CHART_FX__SERIES:
+			return series != null && !series.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //XYZChartFXImpl
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/XYZSeriesFXImpl.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/XYZSeriesFXImpl.java
new file mode 100644
index 00000000..d87f9af9
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/XYZSeriesFXImpl.java
@@ -0,0 +1,227 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart.impl;
+
+import de.dc.javafx.xcore.workbench.chart.ChartPackage;
+import de.dc.javafx.xcore.workbench.chart.XYZSeriesFX;
+import de.dc.javafx.xcore.workbench.chart.XYZValueFX;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>XYZ Series FX</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link de.dc.javafx.xcore.workbench.chart.impl.XYZSeriesFXImpl#getName <em>Name</em>}</li>
+ *   <li>{@link de.dc.javafx.xcore.workbench.chart.impl.XYZSeriesFXImpl#getValues <em>Values</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class XYZSeriesFXImpl extends MinimalEObjectImpl.Container implements XYZSeriesFX {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getValues() <em>Values</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValues()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<XYZValueFX> values;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XYZSeriesFXImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ChartPackage.Literals.XYZ_SERIES_FX;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ChartPackage.XYZ_SERIES_FX__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<XYZValueFX> getValues() {
+		if (values == null) {
+			values = new EObjectContainmentEList<XYZValueFX>(XYZValueFX.class, this,
+					ChartPackage.XYZ_SERIES_FX__VALUES);
+		}
+		return values;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case ChartPackage.XYZ_SERIES_FX__VALUES:
+			return ((InternalEList<?>) getValues()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case ChartPackage.XYZ_SERIES_FX__NAME:
+			return getName();
+		case ChartPackage.XYZ_SERIES_FX__VALUES:
+			return getValues();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ChartPackage.XYZ_SERIES_FX__NAME:
+			setName((String) newValue);
+			return;
+		case ChartPackage.XYZ_SERIES_FX__VALUES:
+			getValues().clear();
+			getValues().addAll((Collection<? extends XYZValueFX>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ChartPackage.XYZ_SERIES_FX__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case ChartPackage.XYZ_SERIES_FX__VALUES:
+			getValues().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ChartPackage.XYZ_SERIES_FX__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case ChartPackage.XYZ_SERIES_FX__VALUES:
+			return values != null && !values.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} //XYZSeriesFXImpl
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/XYZValueFXImpl.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/XYZValueFXImpl.java
new file mode 100644
index 00000000..bc8b0e11
--- /dev/null
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/impl/XYZValueFXImpl.java
@@ -0,0 +1,165 @@
+/**
+ */
+package de.dc.javafx.xcore.workbench.chart.impl;
+
+import de.dc.javafx.xcore.workbench.chart.ChartPackage;
+import de.dc.javafx.xcore.workbench.chart.XYZValueFX;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>XYZ Value FX</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link de.dc.javafx.xcore.workbench.chart.impl.XYZValueFXImpl#getZ <em>Z</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class XYZValueFXImpl extends XYValueFXImpl implements XYZValueFX {
+	/**
+	 * The default value of the '{@link #getZ() <em>Z</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getZ()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double Z_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getZ() <em>Z</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getZ()
+	 * @generated
+	 * @ordered
+	 */
+	protected double z = Z_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XYZValueFXImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ChartPackage.Literals.XYZ_VALUE_FX;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getZ() {
+		return z;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setZ(double newZ) {
+		double oldZ = z;
+		z = newZ;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ChartPackage.XYZ_VALUE_FX__Z, oldZ, z));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case ChartPackage.XYZ_VALUE_FX__Z:
+			return getZ();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case ChartPackage.XYZ_VALUE_FX__Z:
+			setZ((Double) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case ChartPackage.XYZ_VALUE_FX__Z:
+			setZ(Z_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case ChartPackage.XYZ_VALUE_FX__Z:
+			return z != Z_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (z: ");
+		result.append(z);
+		result.append(')');
+		return result.toString();
+	}
+
+} //XYZValueFXImpl
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory.java
index 20cac4dd..b37125ff 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/util/ChartAdapterFactory.java
@@ -86,6 +86,16 @@ public Adapter caseCategoryChartFX(CategoryChartFX object) {
 			return createCategoryChartFXAdapter();
 		}
 
+		@Override
+		public Adapter caseXYZChartFX(XYZChartFX object) {
+			return createXYZChartFXAdapter();
+		}
+
+		@Override
+		public Adapter caseXYZSeriesFX(XYZSeriesFX object) {
+			return createXYZSeriesFXAdapter();
+		}
+
 		@Override
 		public Adapter caseCategorySeriesFX(CategorySeriesFX object) {
 			return createCategorySeriesFXAdapter();
@@ -101,6 +111,11 @@ public Adapter caseXYValueFX(XYValueFX object) {
 			return createXYValueFXAdapter();
 		}
 
+		@Override
+		public Adapter caseXYZValueFX(XYZValueFX object) {
+			return createXYZValueFXAdapter();
+		}
+
 		@Override
 		public Adapter caseCategoryValueFX(CategoryValueFX object) {
 			return createCategoryValueFXAdapter();
@@ -156,6 +171,11 @@ public Adapter casePieChart3dFX(PieChart3dFX object) {
 			return createPieChart3dFXAdapter();
 		}
 
+		@Override
+		public Adapter caseScatterChart3dFX(ScatterChart3dFX object) {
+			return createScatterChart3dFXAdapter();
+		}
+
 		@Override
 		public Adapter caseChartFXConfig(ChartFXConfig object) {
 			return createChartFXConfigAdapter();
@@ -236,6 +256,34 @@ public Adapter createCategoryChartFXAdapter() {
 		return null;
 	}
 
+	/**
+	 * Creates a new adapter for an object of class '{@link de.dc.javafx.xcore.workbench.chart.XYZChartFX <em>XYZ Chart FX</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZChartFX
+	 * @generated
+	 */
+	public Adapter createXYZChartFXAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link de.dc.javafx.xcore.workbench.chart.XYZSeriesFX <em>XYZ Series FX</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZSeriesFX
+	 * @generated
+	 */
+	public Adapter createXYZSeriesFXAdapter() {
+		return null;
+	}
+
 	/**
 	 * Creates a new adapter for an object of class '{@link de.dc.javafx.xcore.workbench.chart.CategorySeriesFX <em>Category Series FX</em>}'.
 	 * <!-- begin-user-doc -->
@@ -278,6 +326,20 @@ public Adapter createXYValueFXAdapter() {
 		return null;
 	}
 
+	/**
+	 * Creates a new adapter for an object of class '{@link de.dc.javafx.xcore.workbench.chart.XYZValueFX <em>XYZ Value FX</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.dc.javafx.xcore.workbench.chart.XYZValueFX
+	 * @generated
+	 */
+	public Adapter createXYZValueFXAdapter() {
+		return null;
+	}
+
 	/**
 	 * Creates a new adapter for an object of class '{@link de.dc.javafx.xcore.workbench.chart.CategoryValueFX <em>Category Value FX</em>}'.
 	 * <!-- begin-user-doc -->
@@ -432,6 +494,20 @@ public Adapter createPieChart3dFXAdapter() {
 		return null;
 	}
 
+	/**
+	 * Creates a new adapter for an object of class '{@link de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX <em>Scatter Chart3d FX</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.dc.javafx.xcore.workbench.chart.ScatterChart3dFX
+	 * @generated
+	 */
+	public Adapter createScatterChart3dFXAdapter() {
+		return null;
+	}
+
 	/**
 	 * Creates a new adapter for an object of class '{@link de.dc.javafx.xcore.workbench.chart.ChartFXConfig <em>FX Config</em>}'.
 	 * <!-- begin-user-doc -->
diff --git a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/util/ChartSwitch.java b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/util/ChartSwitch.java
index c08e343f..19021e5c 100644
--- a/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/util/ChartSwitch.java
+++ b/addon/de.dc.javafx.xcore.workbench.chart/de.dc.javafx.xcore.workbench.chart/src-gen/de/dc/javafx/xcore/workbench/chart/util/ChartSwitch.java
@@ -98,6 +98,22 @@ protected T doSwitch(int classifierID, EObject theEObject) {
 				result = defaultCase(theEObject);
 			return result;
 		}
+		case ChartPackage.XYZ_CHART_FX: {
+			XYZChartFX xyzChartFX = (XYZChartFX) theEObject;
+			T result = caseXYZChartFX(xyzChartFX);
+			if (result == null)
+				result = caseChartFX(xyzChartFX);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case ChartPackage.XYZ_SERIES_FX: {
+			XYZSeriesFX xyzSeriesFX = (XYZSeriesFX) theEObject;
+			T result = caseXYZSeriesFX(xyzSeriesFX);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
 		case ChartPackage.CATEGORY_SERIES_FX: {
 			CategorySeriesFX categorySeriesFX = (CategorySeriesFX) theEObject;
 			T result = caseCategorySeriesFX(categorySeriesFX);
@@ -119,6 +135,15 @@ protected T doSwitch(int classifierID, EObject theEObject) {
 				result = defaultCase(theEObject);
 			return result;
 		}
+		case ChartPackage.XYZ_VALUE_FX: {
+			XYZValueFX xyzValueFX = (XYZValueFX) theEObject;
+			T result = caseXYZValueFX(xyzValueFX);
+			if (result == null)
+				result = caseXYValueFX(xyzValueFX);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
 		case ChartPackage.CATEGORY_VALUE_FX: {
 			CategoryValueFX categoryValueFX = (CategoryValueFX) theEObject;
 			T result = caseCategoryValueFX(categoryValueFX);
@@ -236,6 +261,17 @@ protected T doSwitch(int classifierID, EObject theEObject) {
 				result = defaultCase(theEObject);
 			return result;
 		}
+		case ChartPackage.SCATTER_CHART3D_FX: {
+			ScatterChart3dFX scatterChart3dFX = (ScatterChart3dFX) theEObject;
+			T result = caseScatterChart3dFX(scatterChart3dFX);
+			if (result == null)
+				result = caseXYZChartFX(scatterChart3dFX);
+			if (result == null)
+				result = caseChartFX(scatterChart3dFX);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
 		case ChartPackage.CHART_FX_CONFIG: {
 			ChartFXConfig chartFXConfig = (ChartFXConfig) theEObject;
 			T result = caseChartFXConfig(chartFXConfig);
@@ -308,6 +344,36 @@ public T caseCategoryChartFX(CategoryChartFX object) {
 		return null;
 	}
 
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>XYZ Chart FX</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>XYZ Chart FX</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseXYZChartFX(XYZChartFX object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>XYZ Series FX</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>XYZ Series FX</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseXYZSeriesFX(XYZSeriesFX object) {
+		return null;
+	}
+
 	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Category Series FX</em>'.
 	 * <!-- begin-user-doc -->
@@ -353,6 +419,21 @@ public T caseXYValueFX(XYValueFX object) {
 		return null;
 	}
 
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>XYZ Value FX</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>XYZ Value FX</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseXYZValueFX(XYZValueFX object) {
+		return null;
+	}
+
 	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Category Value FX</em>'.
 	 * <!-- begin-user-doc -->
@@ -518,6 +599,21 @@ public T casePieChart3dFX(PieChart3dFX object) {
 		return null;
 	}
 
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Scatter Chart3d FX</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Scatter Chart3d FX</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseScatterChart3dFX(ScatterChart3dFX object) {
+		return null;
+	}
+
 	/**
 	 * Returns the result of interpreting the object as an instance of '<em>FX Config</em>'.
 	 * <!-- begin-user-doc -->