catch up with branch development

Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>

72 files changed, 4534 insertions, 60 deletions

diff --git a/org.eclipse.osbp.ecview.extension.api/src/org/eclipse/osbp/ecview/extension/api/ILayoutingStrategy.java b/org.eclipse.osbp.ecview.extension.api/src/org/eclipse/osbp/ecview/extension/api/ILayoutingStrategy.java
index 9b1b405..e94a681 100644
--- a/org.eclipse.osbp.ecview.extension.api/src/org/eclipse/osbp/ecview/extension/api/ILayoutingStrategy.java
+++ b/org.eclipse.osbp.ecview.extension.api/src/org/eclipse/osbp/ecview/extension/api/ILayoutingStrategy.java
@@ -95,6 +95,12 @@ public interface ILayoutingStrategy {
 	/** The Constant TAG__THEME_COMBO. */
 	public final static String TAG__THEME_COMBO = "themeCombo";
 
+	/** The Constant TAG__I18N_COMBO. */
+	public final static String TAG__I18N_COMBO = "i18nCombo";
+	
+	/** The Constant TAG__PRINTSERVICE_COMBO. */
+	public final static String TAG__PRINTSERVICE_COMBO = "printserviceCombo";
+	
 	/** The Constant TAG__BLOB. */
 	public static final String TAG__BLOB = "blob";
 
@@ -269,6 +275,12 @@ public interface ILayoutingStrategy {
 	/** The Constant PROPERTY_THEME. */
 	public final static String PROPERTY_THEME = "theme";
 
+	/** The Constant PROPERTY_THEME. */
+	public final static String PROPERTY_I18N = "i18n";
+	
+	/** The Constant PROPERTY_PRINTSERVICE. */
+	public final static String PROPERTY_PRINTSERVICE = "printservice";
+	
 	/** The Constant PROPERTY_SUGGESTTEXT. */
 	public final static String PROPERTY_SUGGESTTEXT = "suggestion";
 
diff --git a/org.eclipse.osbp.ecview.extension.editparts/src/org/eclipse/osbp/ecview/extension/editparts/components/II18nComboBoxEditpart.java b/org.eclipse.osbp.ecview.extension.editparts/src/org/eclipse/osbp/ecview/extension/editparts/components/II18nComboBoxEditpart.java
new file mode 100644
index 0000000..eda656e
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.editparts/src/org/eclipse/osbp/ecview/extension/editparts/components/II18nComboBoxEditpart.java
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf, Austria), Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *         Florian Pirchner - Initial implementation
+ */
+package org.eclipse.osbp.ecview.extension.editparts.components;
+
+import org.eclipse.osbp.ecview.core.common.editpart.IFieldEditpart;
+
+/**
+ * An edit part for icon combobox.
+ */
+public interface II18nComboBoxEditpart extends IFieldEditpart {
+
+}
diff --git a/org.eclipse.osbp.ecview.extension.grid.editparts/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.extension.grid.editparts/META-INF/MANIFEST.MF
index eb18344..3a9728a 100644
--- a/org.eclipse.osbp.ecview.extension.grid.editparts/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.extension.grid.editparts/META-INF/MANIFEST.MF
@@ -9,13 +9,9 @@ Import-Package: org.osgi.service.component;version="1.2.0",
  org.osgi.service.component.annotations;version="1.2.0",
  org.slf4j
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.osbp.ecview.extension.grid.editparts;
-  uses:="org.eclipse.osbp.ecview.core.common.editpart.binding,
-   org.eclipse.osbp.ecview.core.common.editpart";version="0.9.0",
- org.eclipse.osbp.ecview.extension.grid.editparts.presentation;
-  uses:="org.eclipse.osbp.ecview.core.common.editpart.binding,
-   org.eclipse.osbp.ecview.core.common.presentation,
-   org.eclipse.osbp.ecview.extension.editparts";version="0.9.0",
+Export-Package: org.eclipse.osbp.ecview.extension.grid.editparts;version="0.9.0";uses:="org.eclipse.osbp.ecview.core.common.editpart.binding,org.eclipse.osbp.ecview.core.common.editpart",
+ org.eclipse.osbp.ecview.extension.grid.editparts.converter,
+ org.eclipse.osbp.ecview.extension.grid.editparts.presentation;version="0.9.0";uses:="org.eclipse.osbp.ecview.core.common.editpart.binding,org.eclipse.osbp.ecview.core.common.presentation,org.eclipse.osbp.ecview.extension.editparts",
  org.eclipse.osbp.ecview.extension.grid.editparts.renderer;version="0.9.0"
 Require-Bundle: org.eclipse.osbp.ecview.core.common;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.core.databinding;bundle-version="[1.6.0,1.7.0)",
diff --git a/org.eclipse.osbp.ecview.extension.grid.editparts/src/org/eclipse/osbp/ecview/extension/grid/editparts/converter/IGridNestedPropertyConverterEditpart.java b/org.eclipse.osbp.ecview.extension.grid.editparts/src/org/eclipse/osbp/ecview/extension/grid/editparts/converter/IGridNestedPropertyConverterEditpart.java
new file mode 100644
index 0000000..a5026bd
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.grid.editparts/src/org/eclipse/osbp/ecview/extension/grid/editparts/converter/IGridNestedPropertyConverterEditpart.java
@@ -0,0 +1,7 @@
+package org.eclipse.osbp.ecview.extension.grid.editparts.converter;
+
+import org.eclipse.osbp.ecview.core.common.editpart.IConverterEditpart;
+
+public interface IGridNestedPropertyConverterEditpart extends IConverterEditpart {
+
+}
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/.classpath b/org.eclipse.osbp.ecview.extension.grid.model.edit/.classpath
index cf36b56..22f3064 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model.edit/.classpath
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/.project b/org.eclipse.osbp.ecview.extension.grid.model.edit/.project
index 3743a3e..052ddbe 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model.edit/.project
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/.project
@@ -6,11 +6,6 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -30,20 +25,8 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.babel.editor.rbeNature</nature>
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/ctool16/CreateCxGridMetaCell_element_YKanban.gif b/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/ctool16/CreateCxGridMetaCell_element_YKanban.gif
new file mode 100644
index 0000000..f3e037f
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/ctool16/CreateCxGridMetaCell_element_YKanban.gif
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/ctool16/CreateCxGridNestedConverter_nestedTypeConverter_CxGridNestedConverter.gif b/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/ctool16/CreateCxGridNestedConverter_nestedTypeConverter_CxGridNestedConverter.gif
new file mode 100644
index 0000000..fad8ece
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/ctool16/CreateCxGridNestedConverter_nestedTypeConverter_CxGridNestedConverter.gif
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/ctool16/CreateCxGridNestedConverter_nestedTypeConverter_YDelegateConverter.gif b/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/ctool16/CreateCxGridNestedConverter_nestedTypeConverter_YDelegateConverter.gif
new file mode 100644
index 0000000..a0a1713
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/ctool16/CreateCxGridNestedConverter_nestedTypeConverter_YDelegateConverter.gif
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/obj16/CxGridNestedConverter.gif b/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/obj16/CxGridNestedConverter.gif
new file mode 100644
index 0000000..b3643da
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/icons/full/obj16/CxGridNestedConverter.gif
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/plugin.properties b/org.eclipse.osbp.ecview.extension.grid.model.edit/plugin.properties
index fab9ea0..bd277f4 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model.edit/plugin.properties
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/plugin.properties
@@ -154,3 +154,11 @@ _UI_CxGrid_editorSaved_feature = Editor Saved
 _UI_CxGridColumn_type_feature = Type
 _UI_CxGridColumn_typeQualifiedName_feature = Type Qualified Name
 _UI_CxGrid_setLastRefreshTime_feature = Set Last Refresh Time
+_UI_CxGridRenderer_nestedDotPath_feature = Nested Dot Path
+_UI_CxGridNestedConverter_type = Cx Grid Nested Converter
+_UI_CxGridNestedConverter_nestedDotPath_feature = Nested Dot Path
+_UI_CxGridNestedConverter_baseType_feature = Base Type
+_UI_CxGridNestedConverter_baseTypeQualifiedName_feature = Base Type Qualified Name
+_UI_CxGridNestedConverter_nestedType_feature = Nested Type
+_UI_CxGridNestedConverter_nestedTypeQualifiedName_feature = Nested Type Qualified Name
+_UI_CxGridNestedConverter_nestedTypeConverter_feature = Nested Type Converter
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/provider/CxGridItemProvider.java b/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/provider/CxGridItemProvider.java
index a45963c..6439193 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/provider/CxGridItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/provider/CxGridItemProvider.java
@@ -17,6 +17,7 @@ package org.eclipse.osbp.ecview.extension.grid.provider;
 import org.eclipse.osbp.ecview.extension.grid.CxGrid;
 import org.eclipse.osbp.ecview.extension.grid.CxGridFactory;
 import org.eclipse.osbp.ecview.extension.grid.CxGridPackage;
+import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererFactory;
 import java.util.Collection;
 import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -717,6 +718,11 @@ public class CxGridItemProvider extends YInputItemProvider {
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 CxGridRendererFactory.eINSTANCE.createCxGridNestedConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(CxGridPackage.Literals.CX_GRID__COLUMNS,
 				 CxGridFactory.eINSTANCE.createCxGridColumn()));
 
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/provider/CxGridMetaCellItemProvider.java b/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/provider/CxGridMetaCellItemProvider.java
index 6766cb4..b384fc7 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/provider/CxGridMetaCellItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/provider/CxGridMetaCellItemProvider.java
@@ -592,6 +592,11 @@ public class CxGridMetaCellItemProvider
 			(createChildParameter
 				(CxGridPackage.Literals.CX_GRID_META_CELL__ELEMENT,
 				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CxGridPackage.Literals.CX_GRID_META_CELL__ELEMENT,
+				 ExtensionModelFactory.eINSTANCE.createYKanban()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/renderer/provider/CxGridNestedConverterItemProvider.java b/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/renderer/provider/CxGridNestedConverterItemProvider.java
new file mode 100644
index 0000000..375356d
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/renderer/provider/CxGridNestedConverterItemProvider.java
@@ -0,0 +1,384 @@
+/**
+ */
+package org.eclipse.osbp.ecview.extension.grid.renderer.provider;
+
+
+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.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.osbp.ecview.core.common.model.core.CoreModelFactory;
+import org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage;
+
+import org.eclipse.osbp.ecview.extension.grid.provider.CxGridEditPlugin;
+
+import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter;
+import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererFactory;
+import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CxGridNestedConverterItemProvider 
+	extends ItemProviderAdapter
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CxGridNestedConverterItemProvider(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);
+
+			addTagsPropertyDescriptor(object);
+			addIdPropertyDescriptor(object);
+			addNamePropertyDescriptor(object);
+			addNestedDotPathPropertyDescriptor(object);
+			addBaseTypePropertyDescriptor(object);
+			addBaseTypeQualifiedNamePropertyDescriptor(object);
+			addNestedTypePropertyDescriptor(object);
+			addNestedTypeQualifiedNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Tags feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTagsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YTaggable_tags_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YTaggable_tags_feature", "_UI_YTaggable_type"),
+				 CoreModelPackage.Literals.YTAGGABLE__TAGS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Id feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YElement_id_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YElement_id_feature", "_UI_YElement_type"),
+				 CoreModelPackage.Literals.YELEMENT__ID,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * 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_YElement_name_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YElement_name_feature", "_UI_YElement_type"),
+				 CoreModelPackage.Literals.YELEMENT__NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Nested Dot Path feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNestedDotPathPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_CxGridNestedConverter_nestedDotPath_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_CxGridNestedConverter_nestedDotPath_feature", "_UI_CxGridNestedConverter_type"),
+				 CxGridRendererPackage.Literals.CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Base Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addBaseTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_CxGridNestedConverter_baseType_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_CxGridNestedConverter_baseType_feature", "_UI_CxGridNestedConverter_type"),
+				 CxGridRendererPackage.Literals.CX_GRID_NESTED_CONVERTER__BASE_TYPE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Base Type Qualified Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addBaseTypeQualifiedNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_CxGridNestedConverter_baseTypeQualifiedName_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_CxGridNestedConverter_baseTypeQualifiedName_feature", "_UI_CxGridNestedConverter_type"),
+				 CxGridRendererPackage.Literals.CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Nested Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNestedTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_CxGridNestedConverter_nestedType_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_CxGridNestedConverter_nestedType_feature", "_UI_CxGridNestedConverter_type"),
+				 CxGridRendererPackage.Literals.CX_GRID_NESTED_CONVERTER__NESTED_TYPE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Nested Type Qualified Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNestedTypeQualifiedNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_CxGridNestedConverter_nestedTypeQualifiedName_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_CxGridNestedConverter_nestedTypeQualifiedName_feature", "_UI_CxGridNestedConverter_type"),
+				 CxGridRendererPackage.Literals.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_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(CoreModelPackage.Literals.YELEMENT__PROPERTIES);
+			childrenFeatures.add(CxGridRendererPackage.Literals.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER);
+		}
+		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 CxGridNestedConverter.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CxGridNestedConverter"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((CxGridNestedConverter)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_CxGridNestedConverter_type") :
+			getString("_UI_CxGridNestedConverter_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(CxGridNestedConverter.class)) {
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__TAGS:
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__ID:
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NAME:
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH:
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE:
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME:
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE:
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_NAME:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__PROPERTIES:
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER:
+				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
+				(CoreModelPackage.Literals.YELEMENT__PROPERTIES,
+				 CoreModelFactory.eINSTANCE.create(CoreModelPackage.Literals.YSTRING_TO_STRING_MAP)));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CxGridRendererPackage.Literals.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER,
+				 CxGridRendererFactory.eINSTANCE.createCxGridNestedConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CxGridRendererPackage.Literals.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER,
+				 CoreModelFactory.eINSTANCE.createYDelegateConverter()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return CxGridEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/renderer/provider/CxGridRendererItemProviderAdapterFactory.java b/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/renderer/provider/CxGridRendererItemProviderAdapterFactory.java
index 0dc3f9f..6cf7464 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/renderer/provider/CxGridRendererItemProviderAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model.edit/src/org/eclipse/osbp/ecview/extension/grid/renderer/provider/CxGridRendererItemProviderAdapterFactory.java
@@ -370,6 +370,29 @@ public class CxGridRendererItemProviderAdapterFactory extends CxGridRendererAdap
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CxGridNestedConverterItemProvider cxGridNestedConverterItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createCxGridNestedConverterAdapter() {
+		if (cxGridNestedConverterItemProvider == null) {
+			cxGridNestedConverterItemProvider = new CxGridNestedConverterItemProvider(this);
+		}
+
+		return cxGridNestedConverterItemProvider;
+	}
+
+	/**
 	 * This returns the root adapter factory that contains this factory. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -493,6 +516,7 @@ public class CxGridRendererItemProviderAdapterFactory extends CxGridRendererAdap
 		if (cxGridQuantityRendererItemProvider != null) cxGridQuantityRendererItemProvider.dispose();
 		if (cxGridPriceRendererItemProvider != null) cxGridPriceRendererItemProvider.dispose();
 		if (cxGridIndicatorRendererItemProvider != null) cxGridIndicatorRendererItemProvider.dispose();
+		if (cxGridNestedConverterItemProvider != null) cxGridNestedConverterItemProvider.dispose();
 	}
 
 }
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.extension.grid.model/META-INF/MANIFEST.MF
index 9eba5d9..5f0286b 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.extension.grid.model/META-INF/MANIFEST.MF
@@ -23,4 +23,5 @@ Export-Package: org.eclipse.osbp.ecview.extension.grid;version="0.9.0",
  org.eclipse.osbp.ecview.extension.grid.renderer.impl;version="0.9.0",
  org.eclipse.osbp.ecview.extension.grid.renderer.util;version="0.9.0",
  org.eclipse.osbp.ecview.extension.grid.util;version="0.9.0"
-Import-Package: org.eclipse.osbp.ui.api.useraccess;version="0.9.0"
+Import-Package: org.eclipse.osbp.runtime.common.annotations;version="0.9.0",
+ org.eclipse.osbp.ui.api.useraccess;version="0.9.0"
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/model/cxgrid.ecore b/org.eclipse.osbp.ecview.extension.grid.model/model/cxgrid.ecore
index b3a7415..f1f4478 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/model/cxgrid.ecore
+++ b/org.eclipse.osbp.ecview.extension.grid.model/model/cxgrid.ecore
@@ -114,6 +114,9 @@
       </eGenericType>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editsDto" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filterPropertyPathForEditsDto"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CxGridCellStyleGenerator" abstract="true"
       eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement #//CxGridProvider"/>
@@ -209,6 +212,26 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="redEnds" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="greenStarts" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="CxGridNestedConverter" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YConverter">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nestedDotPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseType">
+        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+          <eTypeArguments/>
+        </eGenericType>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseTypeQualifiedName"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nestedType">
+        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+          <eTypeArguments/>
+        </eGenericType>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nestedTypeQualifiedName"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="nestedTypeConverter"
+          eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YConverter"
+          containment="true"/>
+    </eClassifiers>
   </eSubpackages>
   <eSubpackages name="memento" nsURI="http://osbp.de/ecview/v1/extension/grid/memento"
       nsPrefix="memento">
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/CxGridColumn.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/CxGridColumn.java
index 7fa5826..54b7af1 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/CxGridColumn.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/CxGridColumn.java
@@ -51,6 +51,8 @@ import org.eclipse.osbp.ecview.core.extension.model.extension.YSearchField;
  *   <li>{@link org.eclipse.osbp.ecview.extension.grid.CxGridColumn#getUsedInMetaCells <em>Used In Meta Cells</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.extension.grid.CxGridColumn#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.extension.grid.CxGridColumn#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.CxGridColumn#isEditsDto <em>Edits Dto</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.CxGridColumn#getFilterPropertyPathForEditsDto <em>Filter Property Path For Edits Dto</em>}</li>
  * </ul>
  *
  * @see org.eclipse.osbp.ecview.extension.grid.CxGridPackage#getCxGridColumn()
@@ -604,4 +606,56 @@ public interface CxGridColumn extends CxGridGroupable, YHelperLayoutProvider {
 	 */
 	void setTypeQualifiedName(String value);
 
+	/**
+	 * Returns the value of the '<em><b>Edits Dto</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Edits Dto</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Edits Dto</em>' attribute.
+	 * @see #setEditsDto(boolean)
+	 * @see org.eclipse.osbp.ecview.extension.grid.CxGridPackage#getCxGridColumn_EditsDto()
+	 * @model
+	 * @generated
+	 */
+	boolean isEditsDto();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.grid.CxGridColumn#isEditsDto <em>Edits Dto</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Edits Dto</em>' attribute.
+	 * @see #isEditsDto()
+	 * @generated
+	 */
+	void setEditsDto(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Filter Property Path For Edits Dto</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Filter Property Path For Edits Dto</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Filter Property Path For Edits Dto</em>' attribute.
+	 * @see #setFilterPropertyPathForEditsDto(String)
+	 * @see org.eclipse.osbp.ecview.extension.grid.CxGridPackage#getCxGridColumn_FilterPropertyPathForEditsDto()
+	 * @model
+	 * @generated
+	 */
+	String getFilterPropertyPathForEditsDto();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.grid.CxGridColumn#getFilterPropertyPathForEditsDto <em>Filter Property Path For Edits Dto</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Filter Property Path For Edits Dto</em>' attribute.
+	 * @see #getFilterPropertyPathForEditsDto()
+	 * @generated
+	 */
+	void setFilterPropertyPathForEditsDto(String value);
+
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/CxGridPackage.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/CxGridPackage.java
index 5cd55d4..29a694b 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/CxGridPackage.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/CxGridPackage.java
@@ -1368,13 +1368,31 @@ public interface CxGridPackage extends EPackage {
 	int CX_GRID_COLUMN__TYPE_QUALIFIED_NAME = CX_GRID_GROUPABLE_FEATURE_COUNT + 20;
 
 	/**
+	 * The feature id for the '<em><b>Edits Dto</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_COLUMN__EDITS_DTO = CX_GRID_GROUPABLE_FEATURE_COUNT + 21;
+
+	/**
+	 * The feature id for the '<em><b>Filter Property Path For Edits Dto</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_COLUMN__FILTER_PROPERTY_PATH_FOR_EDITS_DTO = CX_GRID_GROUPABLE_FEATURE_COUNT + 22;
+
+	/**
 	 * The number of structural features of the '<em>Column</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CX_GRID_COLUMN_FEATURE_COUNT = CX_GRID_GROUPABLE_FEATURE_COUNT + 21;
+	int CX_GRID_COLUMN_FEATURE_COUNT = CX_GRID_GROUPABLE_FEATURE_COUNT + 23;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.extension.grid.impl.CxGridCellStyleGeneratorImpl <em>Cell Style Generator</em>}' class.
@@ -2274,6 +2292,28 @@ public interface CxGridPackage extends EPackage {
 	EAttribute getCxGridColumn_TypeQualifiedName();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.grid.CxGridColumn#isEditsDto <em>Edits Dto</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Edits Dto</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.grid.CxGridColumn#isEditsDto()
+	 * @see #getCxGridColumn()
+	 * @generated
+	 */
+	EAttribute getCxGridColumn_EditsDto();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.grid.CxGridColumn#getFilterPropertyPathForEditsDto <em>Filter Property Path For Edits Dto</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Filter Property Path For Edits Dto</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.grid.CxGridColumn#getFilterPropertyPathForEditsDto()
+	 * @see #getCxGridColumn()
+	 * @generated
+	 */
+	EAttribute getCxGridColumn_FilterPropertyPathForEditsDto();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.extension.grid.CxGridCellStyleGenerator <em>Cell Style Generator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2900,6 +2940,22 @@ public interface CxGridPackage extends EPackage {
 		EAttribute CX_GRID_COLUMN__TYPE_QUALIFIED_NAME = eINSTANCE.getCxGridColumn_TypeQualifiedName();
 
 		/**
+		 * The meta object literal for the '<em><b>Edits Dto</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CX_GRID_COLUMN__EDITS_DTO = eINSTANCE.getCxGridColumn_EditsDto();
+
+		/**
+		 * The meta object literal for the '<em><b>Filter Property Path For Edits Dto</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CX_GRID_COLUMN__FILTER_PROPERTY_PATH_FOR_EDITS_DTO = eINSTANCE.getCxGridColumn_FilterPropertyPathForEditsDto();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.extension.grid.impl.CxGridCellStyleGeneratorImpl <em>Cell Style Generator</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/impl/CxGridColumnImpl.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/impl/CxGridColumnImpl.java
index 496a44c..66f8a4e 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/impl/CxGridColumnImpl.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/impl/CxGridColumnImpl.java
@@ -62,6 +62,8 @@ import org.eclipse.osbp.ecview.extension.grid.util.CxGridUtil;
  *   <li>{@link org.eclipse.osbp.ecview.extension.grid.impl.CxGridColumnImpl#getUsedInMetaCells <em>Used In Meta Cells</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.extension.grid.impl.CxGridColumnImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.extension.grid.impl.CxGridColumnImpl#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.impl.CxGridColumnImpl#isEditsDto <em>Edits Dto</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.impl.CxGridColumnImpl#getFilterPropertyPathForEditsDto <em>Filter Property Path For Edits Dto</em>}</li>
  * </ul>
  *
  * @generated
@@ -409,6 +411,46 @@ public class CxGridColumnImpl extends CxGridGroupableImpl implements
 	protected String typeQualifiedName = TYPE_QUALIFIED_NAME_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #isEditsDto() <em>Edits Dto</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isEditsDto()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EDITS_DTO_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isEditsDto() <em>Edits Dto</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isEditsDto()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean editsDto = EDITS_DTO_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFilterPropertyPathForEditsDto() <em>Filter Property Path For Edits Dto</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFilterPropertyPathForEditsDto()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FILTER_PROPERTY_PATH_FOR_EDITS_DTO_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFilterPropertyPathForEditsDto() <em>Filter Property Path For Edits Dto</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFilterPropertyPathForEditsDto()
+	 * @generated
+	 * @ordered
+	 */
+	protected String filterPropertyPathForEditsDto = FILTER_PROPERTY_PATH_FOR_EDITS_DTO_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @generated
@@ -1076,6 +1118,48 @@ public class CxGridColumnImpl extends CxGridGroupableImpl implements
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isEditsDto() {
+		return editsDto;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEditsDto(boolean newEditsDto) {
+		boolean oldEditsDto = editsDto;
+		editsDto = newEditsDto;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridPackage.CX_GRID_COLUMN__EDITS_DTO, oldEditsDto, editsDto));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFilterPropertyPathForEditsDto() {
+		return filterPropertyPathForEditsDto;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFilterPropertyPathForEditsDto(String newFilterPropertyPathForEditsDto) {
+		String oldFilterPropertyPathForEditsDto = filterPropertyPathForEditsDto;
+		filterPropertyPathForEditsDto = newFilterPropertyPathForEditsDto;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridPackage.CX_GRID_COLUMN__FILTER_PROPERTY_PATH_FOR_EDITS_DTO, oldFilterPropertyPathForEditsDto, filterPropertyPathForEditsDto));
+	}
+
+	/**
 	 * <!-- begin-user-doc --> Returns the layout which contains the editor
 	 * fields. <!-- end-user-doc -->
 	 *
@@ -1195,6 +1279,10 @@ public class CxGridColumnImpl extends CxGridGroupableImpl implements
 				return getType();
 			case CxGridPackage.CX_GRID_COLUMN__TYPE_QUALIFIED_NAME:
 				return getTypeQualifiedName();
+			case CxGridPackage.CX_GRID_COLUMN__EDITS_DTO:
+				return isEditsDto();
+			case CxGridPackage.CX_GRID_COLUMN__FILTER_PROPERTY_PATH_FOR_EDITS_DTO:
+				return getFilterPropertyPathForEditsDto();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -1276,6 +1364,12 @@ public class CxGridColumnImpl extends CxGridGroupableImpl implements
 			case CxGridPackage.CX_GRID_COLUMN__TYPE_QUALIFIED_NAME:
 				setTypeQualifiedName((String)newValue);
 				return;
+			case CxGridPackage.CX_GRID_COLUMN__EDITS_DTO:
+				setEditsDto((Boolean)newValue);
+				return;
+			case CxGridPackage.CX_GRID_COLUMN__FILTER_PROPERTY_PATH_FOR_EDITS_DTO:
+				setFilterPropertyPathForEditsDto((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -1353,6 +1447,12 @@ public class CxGridColumnImpl extends CxGridGroupableImpl implements
 			case CxGridPackage.CX_GRID_COLUMN__TYPE_QUALIFIED_NAME:
 				setTypeQualifiedName(TYPE_QUALIFIED_NAME_EDEFAULT);
 				return;
+			case CxGridPackage.CX_GRID_COLUMN__EDITS_DTO:
+				setEditsDto(EDITS_DTO_EDEFAULT);
+				return;
+			case CxGridPackage.CX_GRID_COLUMN__FILTER_PROPERTY_PATH_FOR_EDITS_DTO:
+				setFilterPropertyPathForEditsDto(FILTER_PROPERTY_PATH_FOR_EDITS_DTO_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -1410,6 +1510,10 @@ public class CxGridColumnImpl extends CxGridGroupableImpl implements
 				return type != null;
 			case CxGridPackage.CX_GRID_COLUMN__TYPE_QUALIFIED_NAME:
 				return TYPE_QUALIFIED_NAME_EDEFAULT == null ? typeQualifiedName != null : !TYPE_QUALIFIED_NAME_EDEFAULT.equals(typeQualifiedName);
+			case CxGridPackage.CX_GRID_COLUMN__EDITS_DTO:
+				return editsDto != EDITS_DTO_EDEFAULT;
+			case CxGridPackage.CX_GRID_COLUMN__FILTER_PROPERTY_PATH_FOR_EDITS_DTO:
+				return FILTER_PROPERTY_PATH_FOR_EDITS_DTO_EDEFAULT == null ? filterPropertyPathForEditsDto != null : !FILTER_PROPERTY_PATH_FOR_EDITS_DTO_EDEFAULT.equals(filterPropertyPathForEditsDto);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -1457,6 +1561,10 @@ public class CxGridColumnImpl extends CxGridGroupableImpl implements
 		result.append(type);
 		result.append(", typeQualifiedName: ");
 		result.append(typeQualifiedName);
+		result.append(", editsDto: ");
+		result.append(editsDto);
+		result.append(", filterPropertyPathForEditsDto: ");
+		result.append(filterPropertyPathForEditsDto);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/impl/CxGridPackageImpl.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/impl/CxGridPackageImpl.java
index 85ebce3..e9b1df4 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/impl/CxGridPackageImpl.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/impl/CxGridPackageImpl.java
@@ -869,6 +869,24 @@ public class CxGridPackageImpl extends EPackageImpl implements CxGridPackage {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCxGridColumn_EditsDto() {
+		return (EAttribute)cxGridColumnEClass.getEStructuralFeatures().get(21);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCxGridColumn_FilterPropertyPathForEditsDto() {
+		return (EAttribute)cxGridColumnEClass.getEStructuralFeatures().get(22);
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @return the cx grid cell style generator
@@ -1031,6 +1049,8 @@ public class CxGridPackageImpl extends EPackageImpl implements CxGridPackage {
 		createEReference(cxGridColumnEClass, CX_GRID_COLUMN__USED_IN_META_CELLS);
 		createEAttribute(cxGridColumnEClass, CX_GRID_COLUMN__TYPE);
 		createEAttribute(cxGridColumnEClass, CX_GRID_COLUMN__TYPE_QUALIFIED_NAME);
+		createEAttribute(cxGridColumnEClass, CX_GRID_COLUMN__EDITS_DTO);
+		createEAttribute(cxGridColumnEClass, CX_GRID_COLUMN__FILTER_PROPERTY_PATH_FOR_EDITS_DTO);
 
 		cxGridCellStyleGeneratorEClass = createEClass(CX_GRID_CELL_STYLE_GENERATOR);
 
@@ -1185,6 +1205,8 @@ public class CxGridPackageImpl extends EPackageImpl implements CxGridPackage {
 		g1.getETypeArguments().add(g2);
 		initEAttribute(getCxGridColumn_Type(), g1, "type", null, 0, 1, CxGridColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCxGridColumn_TypeQualifiedName(), ecorePackage.getEString(), "typeQualifiedName", null, 0, 1, CxGridColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCxGridColumn_EditsDto(), ecorePackage.getEBoolean(), "editsDto", null, 0, 1, CxGridColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCxGridColumn_FilterPropertyPathForEditsDto(), ecorePackage.getEString(), "filterPropertyPathForEditsDto", null, 0, 1, CxGridColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(cxGridCellStyleGeneratorEClass, CxGridCellStyleGenerator.class, "CxGridCellStyleGenerator", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridNestedConverter.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridNestedConverter.java
new file mode 100644
index 0000000..750ac83
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridNestedConverter.java
@@ -0,0 +1,185 @@
+/**
+ */
+package org.eclipse.osbp.ecview.extension.grid.renderer;
+
+import org.eclipse.osbp.ecview.core.common.model.core.YConverter;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cx Grid Nested Converter</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedDotPath <em>Nested Dot Path</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getBaseType <em>Base Type</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getBaseTypeQualifiedName <em>Base Type Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedType <em>Nested Type</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedTypeQualifiedName <em>Nested Type Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedTypeConverter <em>Nested Type Converter</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererPackage#getCxGridNestedConverter()
+ * @model
+ * @generated
+ */
+public interface CxGridNestedConverter extends YConverter {
+	/**
+	 * Returns the value of the '<em><b>Nested Dot Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Nested Dot Path</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Nested Dot Path</em>' attribute.
+	 * @see #setNestedDotPath(String)
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererPackage#getCxGridNestedConverter_NestedDotPath()
+	 * @model
+	 * @generated
+	 */
+	String getNestedDotPath();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedDotPath <em>Nested Dot Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Nested Dot Path</em>' attribute.
+	 * @see #getNestedDotPath()
+	 * @generated
+	 */
+	void setNestedDotPath(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Base Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Base Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Base Type</em>' attribute.
+	 * @see #setBaseType(Class)
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererPackage#getCxGridNestedConverter_BaseType()
+	 * @model
+	 * @generated
+	 */
+	Class<?> getBaseType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getBaseType <em>Base Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Base Type</em>' attribute.
+	 * @see #getBaseType()
+	 * @generated
+	 */
+	void setBaseType(Class<?> value);
+
+	/**
+	 * Returns the value of the '<em><b>Base Type Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Base Type Qualified Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Base Type Qualified Name</em>' attribute.
+	 * @see #setBaseTypeQualifiedName(String)
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererPackage#getCxGridNestedConverter_BaseTypeQualifiedName()
+	 * @model
+	 * @generated
+	 */
+	String getBaseTypeQualifiedName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getBaseTypeQualifiedName <em>Base Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Base Type Qualified Name</em>' attribute.
+	 * @see #getBaseTypeQualifiedName()
+	 * @generated
+	 */
+	void setBaseTypeQualifiedName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Nested Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Nested Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Nested Type</em>' attribute.
+	 * @see #setNestedType(Class)
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererPackage#getCxGridNestedConverter_NestedType()
+	 * @model
+	 * @generated
+	 */
+	Class<?> getNestedType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedType <em>Nested Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Nested Type</em>' attribute.
+	 * @see #getNestedType()
+	 * @generated
+	 */
+	void setNestedType(Class<?> value);
+
+	/**
+	 * Returns the value of the '<em><b>Nested Type Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Nested Type Qualified Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Nested Type Qualified Name</em>' attribute.
+	 * @see #setNestedTypeQualifiedName(String)
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererPackage#getCxGridNestedConverter_NestedTypeQualifiedName()
+	 * @model
+	 * @generated
+	 */
+	String getNestedTypeQualifiedName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedTypeQualifiedName <em>Nested Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Nested Type Qualified Name</em>' attribute.
+	 * @see #getNestedTypeQualifiedName()
+	 * @generated
+	 */
+	void setNestedTypeQualifiedName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Nested Type Converter</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Nested Type Converter</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Nested Type Converter</em>' containment reference.
+	 * @see #setNestedTypeConverter(YConverter)
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererPackage#getCxGridNestedConverter_NestedTypeConverter()
+	 * @model containment="true"
+	 * @generated
+	 */
+	YConverter getNestedTypeConverter();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedTypeConverter <em>Nested Type Converter</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Nested Type Converter</em>' containment reference.
+	 * @see #getNestedTypeConverter()
+	 * @generated
+	 */
+	void setNestedTypeConverter(YConverter value);
+
+} // CxGridNestedConverter
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridRendererFactory.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridRendererFactory.java
index dfedd47..0cc0bdb 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridRendererFactory.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridRendererFactory.java
@@ -152,6 +152,15 @@ public interface CxGridRendererFactory extends EFactory {
 	CxGridIndicatorRenderer createCxGridIndicatorRenderer();
 
 	/**
+	 * Returns a new object of class '<em>Cx Grid Nested Converter</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Cx Grid Nested Converter</em>'.
+	 * @generated
+	 */
+	CxGridNestedConverter createCxGridNestedConverter();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridRendererPackage.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridRendererPackage.java
index cd51922..761f43b 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridRendererPackage.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/CxGridRendererPackage.java
@@ -1044,6 +1044,116 @@ public interface CxGridRendererPackage extends EPackage {
 
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl <em>Cx Grid Nested Converter</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridRendererPackageImpl#getCxGridNestedConverter()
+	 * @generated
+	 */
+	int CX_GRID_NESTED_CONVERTER = 14;
+
+	/**
+	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__TAGS = CoreModelPackage.YCONVERTER__TAGS;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__ID = CoreModelPackage.YCONVERTER__ID;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__NAME = CoreModelPackage.YCONVERTER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__PROPERTIES = CoreModelPackage.YCONVERTER__PROPERTIES;
+
+	/**
+	 * The feature id for the '<em><b>Nested Dot Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH = CoreModelPackage.YCONVERTER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Base Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__BASE_TYPE = CoreModelPackage.YCONVERTER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Base Type Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME = CoreModelPackage.YCONVERTER_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Nested Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__NESTED_TYPE = CoreModelPackage.YCONVERTER_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Nested Type Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_NAME = CoreModelPackage.YCONVERTER_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Nested Type Converter</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER = CoreModelPackage.YCONVERTER_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of structural features of the '<em>Cx Grid Nested Converter</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CX_GRID_NESTED_CONVERTER_FEATURE_COUNT = CoreModelPackage.YCONVERTER_FEATURE_COUNT + 6;
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRenderer <em>Cx Grid Renderer</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1470,6 +1580,82 @@ public interface CxGridRendererPackage extends EPackage {
 	EAttribute getCxGridIndicatorRenderer_GreenStarts();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter <em>Cx Grid Nested Converter</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Cx Grid Nested Converter</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter
+	 * @generated
+	 */
+	EClass getCxGridNestedConverter();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedDotPath <em>Nested Dot Path</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Nested Dot Path</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedDotPath()
+	 * @see #getCxGridNestedConverter()
+	 * @generated
+	 */
+	EAttribute getCxGridNestedConverter_NestedDotPath();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getBaseType <em>Base Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Base Type</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getBaseType()
+	 * @see #getCxGridNestedConverter()
+	 * @generated
+	 */
+	EAttribute getCxGridNestedConverter_BaseType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getBaseTypeQualifiedName <em>Base Type Qualified Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Base Type Qualified Name</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getBaseTypeQualifiedName()
+	 * @see #getCxGridNestedConverter()
+	 * @generated
+	 */
+	EAttribute getCxGridNestedConverter_BaseTypeQualifiedName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedType <em>Nested Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Nested Type</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedType()
+	 * @see #getCxGridNestedConverter()
+	 * @generated
+	 */
+	EAttribute getCxGridNestedConverter_NestedType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedTypeQualifiedName <em>Nested Type Qualified Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Nested Type Qualified Name</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedTypeQualifiedName()
+	 * @see #getCxGridNestedConverter()
+	 * @generated
+	 */
+	EAttribute getCxGridNestedConverter_NestedTypeQualifiedName();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedTypeConverter <em>Nested Type Converter</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Nested Type Converter</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter#getNestedTypeConverter()
+	 * @see #getCxGridNestedConverter()
+	 * @generated
+	 */
+	EReference getCxGridNestedConverter_NestedTypeConverter();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1840,6 +2026,64 @@ public interface CxGridRendererPackage extends EPackage {
 		 */
 		EAttribute CX_GRID_INDICATOR_RENDERER__GREEN_STARTS = eINSTANCE.getCxGridIndicatorRenderer_GreenStarts();
 
+		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl <em>Cx Grid Nested Converter</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl
+		 * @see org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridRendererPackageImpl#getCxGridNestedConverter()
+		 * @generated
+		 */
+		EClass CX_GRID_NESTED_CONVERTER = eINSTANCE.getCxGridNestedConverter();
+
+		/**
+		 * The meta object literal for the '<em><b>Nested Dot Path</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH = eINSTANCE.getCxGridNestedConverter_NestedDotPath();
+
+		/**
+		 * The meta object literal for the '<em><b>Base Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CX_GRID_NESTED_CONVERTER__BASE_TYPE = eINSTANCE.getCxGridNestedConverter_BaseType();
+
+		/**
+		 * The meta object literal for the '<em><b>Base Type Qualified Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME = eINSTANCE.getCxGridNestedConverter_BaseTypeQualifiedName();
+
+		/**
+		 * The meta object literal for the '<em><b>Nested Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CX_GRID_NESTED_CONVERTER__NESTED_TYPE = eINSTANCE.getCxGridNestedConverter_NestedType();
+
+		/**
+		 * The meta object literal for the '<em><b>Nested Type Qualified Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_NAME = eINSTANCE.getCxGridNestedConverter_NestedTypeQualifiedName();
+
+		/**
+		 * The meta object literal for the '<em><b>Nested Type Converter</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER = eINSTANCE.getCxGridNestedConverter_NestedTypeConverter();
+
 	}
 
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridNestedConverterImpl.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridNestedConverterImpl.java
new file mode 100644
index 0000000..5134402
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridNestedConverterImpl.java
@@ -0,0 +1,635 @@
+/**
+ */
+package org.eclipse.osbp.ecview.extension.grid.renderer.impl;
+
+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.common.util.EMap;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+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.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EcoreEMap;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage;
+
+import org.eclipse.osbp.ecview.core.common.model.core.YConverter;
+import org.eclipse.osbp.ecview.core.common.model.core.impl.YStringToStringMapImpl;
+
+import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter;
+import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridRendererPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cx Grid Nested Converter</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getTags <em>Tags</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getProperties <em>Properties</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getNestedDotPath <em>Nested Dot Path</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getBaseType <em>Base Type</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getBaseTypeQualifiedName <em>Base Type Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getNestedType <em>Nested Type</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getNestedTypeQualifiedName <em>Nested Type Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.grid.renderer.impl.CxGridNestedConverterImpl#getNestedTypeConverter <em>Nested Type Converter</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CxGridNestedConverterImpl extends MinimalEObjectImpl.Container implements CxGridNestedConverter {
+	/**
+	 * The cached value of the '{@link #getTags() <em>Tags</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTags()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> tags;
+
+	/**
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id = ID_EDEFAULT;
+
+	/**
+	 * 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 #getProperties() <em>Properties</em>}' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getProperties()
+	 * @generated
+	 * @ordered
+	 */
+	protected EMap<String, String> properties;
+
+	/**
+	 * The default value of the '{@link #getNestedDotPath() <em>Nested Dot Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNestedDotPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NESTED_DOT_PATH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNestedDotPath() <em>Nested Dot Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNestedDotPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected String nestedDotPath = NESTED_DOT_PATH_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getBaseType() <em>Base Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBaseType()
+	 * @generated
+	 * @ordered
+	 */
+	protected Class<?> baseType;
+
+	/**
+	 * The default value of the '{@link #getBaseTypeQualifiedName() <em>Base Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBaseTypeQualifiedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String BASE_TYPE_QUALIFIED_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getBaseTypeQualifiedName() <em>Base Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBaseTypeQualifiedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String baseTypeQualifiedName = BASE_TYPE_QUALIFIED_NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getNestedType() <em>Nested Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNestedType()
+	 * @generated
+	 * @ordered
+	 */
+	protected Class<?> nestedType;
+
+	/**
+	 * The default value of the '{@link #getNestedTypeQualifiedName() <em>Nested Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNestedTypeQualifiedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NESTED_TYPE_QUALIFIED_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNestedTypeQualifiedName() <em>Nested Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNestedTypeQualifiedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String nestedTypeQualifiedName = NESTED_TYPE_QUALIFIED_NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getNestedTypeConverter() <em>Nested Type Converter</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNestedTypeConverter()
+	 * @generated
+	 * @ordered
+	 */
+	protected YConverter nestedTypeConverter;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CxGridNestedConverterImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CxGridRendererPackage.Literals.CX_GRID_NESTED_CONVERTER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<String> getTags() {
+		if (tags == null) {
+			tags = new EDataTypeUniqueEList<String>(String.class, this, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__TAGS);
+		}
+		return tags;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setId(String newId) {
+		String oldId = id;
+		id = newId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__ID, oldId, id));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EMap<String, String> getProperties() {
+		if (properties == null) {
+			properties = new EcoreEMap<String,String>(CoreModelPackage.Literals.YSTRING_TO_STRING_MAP, YStringToStringMapImpl.class, this, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__PROPERTIES);
+		}
+		return properties;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getNestedDotPath() {
+		return nestedDotPath;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNestedDotPath(String newNestedDotPath) {
+		String oldNestedDotPath = nestedDotPath;
+		nestedDotPath = newNestedDotPath;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH, oldNestedDotPath, nestedDotPath));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Class<?> getBaseType() {
+		return baseType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setBaseType(Class<?> newBaseType) {
+		Class<?> oldBaseType = baseType;
+		baseType = newBaseType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE, oldBaseType, baseType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getBaseTypeQualifiedName() {
+		return baseTypeQualifiedName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setBaseTypeQualifiedName(String newBaseTypeQualifiedName) {
+		String oldBaseTypeQualifiedName = baseTypeQualifiedName;
+		baseTypeQualifiedName = newBaseTypeQualifiedName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME, oldBaseTypeQualifiedName, baseTypeQualifiedName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Class<?> getNestedType() {
+		return nestedType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNestedType(Class<?> newNestedType) {
+		Class<?> oldNestedType = nestedType;
+		nestedType = newNestedType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE, oldNestedType, nestedType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getNestedTypeQualifiedName() {
+		return nestedTypeQualifiedName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNestedTypeQualifiedName(String newNestedTypeQualifiedName) {
+		String oldNestedTypeQualifiedName = nestedTypeQualifiedName;
+		nestedTypeQualifiedName = newNestedTypeQualifiedName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_NAME, oldNestedTypeQualifiedName, nestedTypeQualifiedName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YConverter getNestedTypeConverter() {
+		return nestedTypeConverter;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetNestedTypeConverter(YConverter newNestedTypeConverter, NotificationChain msgs) {
+		YConverter oldNestedTypeConverter = nestedTypeConverter;
+		nestedTypeConverter = newNestedTypeConverter;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER, oldNestedTypeConverter, newNestedTypeConverter);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNestedTypeConverter(YConverter newNestedTypeConverter) {
+		if (newNestedTypeConverter != nestedTypeConverter) {
+			NotificationChain msgs = null;
+			if (nestedTypeConverter != null)
+				msgs = ((InternalEObject)nestedTypeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER, null, msgs);
+			if (newNestedTypeConverter != null)
+				msgs = ((InternalEObject)newNestedTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER, null, msgs);
+			msgs = basicSetNestedTypeConverter(newNestedTypeConverter, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER, newNestedTypeConverter, newNestedTypeConverter));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__PROPERTIES:
+				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER:
+				return basicSetNestedTypeConverter(null, 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 CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__TAGS:
+				return getTags();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__ID:
+				return getId();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NAME:
+				return getName();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__PROPERTIES:
+				if (coreType) return getProperties();
+				else return getProperties().map();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH:
+				return getNestedDotPath();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE:
+				return getBaseType();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME:
+				return getBaseTypeQualifiedName();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE:
+				return getNestedType();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_NAME:
+				return getNestedTypeQualifiedName();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER:
+				return getNestedTypeConverter();
+		}
+		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 CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__TAGS:
+				getTags().clear();
+				getTags().addAll((Collection<? extends String>)newValue);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__ID:
+				setId((String)newValue);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NAME:
+				setName((String)newValue);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__PROPERTIES:
+				((EStructuralFeature.Setting)getProperties()).set(newValue);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH:
+				setNestedDotPath((String)newValue);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE:
+				setBaseType((Class<?>)newValue);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME:
+				setBaseTypeQualifiedName((String)newValue);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE:
+				setNestedType((Class<?>)newValue);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_NAME:
+				setNestedTypeQualifiedName((String)newValue);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER:
+				setNestedTypeConverter((YConverter)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__TAGS:
+				getTags().clear();
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__ID:
+				setId(ID_EDEFAULT);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__PROPERTIES:
+				getProperties().clear();
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH:
+				setNestedDotPath(NESTED_DOT_PATH_EDEFAULT);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE:
+				setBaseType((Class<?>)null);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME:
+				setBaseTypeQualifiedName(BASE_TYPE_QUALIFIED_NAME_EDEFAULT);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE:
+				setNestedType((Class<?>)null);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_NAME:
+				setNestedTypeQualifiedName(NESTED_TYPE_QUALIFIED_NAME_EDEFAULT);
+				return;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER:
+				setNestedTypeConverter((YConverter)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__TAGS:
+				return tags != null && !tags.isEmpty();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__ID:
+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__PROPERTIES:
+				return properties != null && !properties.isEmpty();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH:
+				return NESTED_DOT_PATH_EDEFAULT == null ? nestedDotPath != null : !NESTED_DOT_PATH_EDEFAULT.equals(nestedDotPath);
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE:
+				return baseType != null;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME:
+				return BASE_TYPE_QUALIFIED_NAME_EDEFAULT == null ? baseTypeQualifiedName != null : !BASE_TYPE_QUALIFIED_NAME_EDEFAULT.equals(baseTypeQualifiedName);
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE:
+				return nestedType != null;
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_NAME:
+				return NESTED_TYPE_QUALIFIED_NAME_EDEFAULT == null ? nestedTypeQualifiedName != null : !NESTED_TYPE_QUALIFIED_NAME_EDEFAULT.equals(nestedTypeQualifiedName);
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER:
+				return nestedTypeConverter != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (tags: ");
+		result.append(tags);
+		result.append(", id: ");
+		result.append(id);
+		result.append(", name: ");
+		result.append(name);
+		result.append(", nestedDotPath: ");
+		result.append(nestedDotPath);
+		result.append(", baseType: ");
+		result.append(baseType);
+		result.append(", baseTypeQualifiedName: ");
+		result.append(baseTypeQualifiedName);
+		result.append(", nestedType: ");
+		result.append(nestedType);
+		result.append(", nestedTypeQualifiedName: ");
+		result.append(nestedTypeQualifiedName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CxGridNestedConverterImpl
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridRendererFactoryImpl.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridRendererFactoryImpl.java
index 6e4c4b5..aad7abe 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridRendererFactoryImpl.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridRendererFactoryImpl.java
@@ -85,6 +85,7 @@ public class CxGridRendererFactoryImpl extends EFactoryImpl implements CxGridRen
 			case CxGridRendererPackage.CX_GRID_QUANTITY_RENDERER: return createCxGridQuantityRenderer();
 			case CxGridRendererPackage.CX_GRID_PRICE_RENDERER: return createCxGridPriceRenderer();
 			case CxGridRendererPackage.CX_GRID_INDICATOR_RENDERER: return createCxGridIndicatorRenderer();
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER: return createCxGridNestedConverter();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -234,6 +235,16 @@ public class CxGridRendererFactoryImpl extends EFactoryImpl implements CxGridRen
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CxGridNestedConverter createCxGridNestedConverter() {
+		CxGridNestedConverterImpl cxGridNestedConverter = new CxGridNestedConverterImpl();
+		return cxGridNestedConverter;
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @return the cx grid renderer package
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridRendererPackageImpl.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridRendererPackageImpl.java
index 425b6bd..1db4bf5 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridRendererPackageImpl.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/impl/CxGridRendererPackageImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridDelegateRenderer;
 import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridHtmlRenderer;
 import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridImageRenderer;
 import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridIndicatorRenderer;
+import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter;
 import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNumberRenderer;
 import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridPriceRenderer;
 import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridProgressBarRenderer;
@@ -38,6 +39,7 @@ import org.eclipse.osbp.ecview.extension.grid.renderer.CxGridTextRenderer;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EGenericType;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.EReference;
@@ -157,6 +159,13 @@ public class CxGridRendererPackageImpl extends EPackageImpl implements CxGridRen
 	private EClass cxGridIndicatorRendererEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cxGridNestedConverterEClass = null;
+
+	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
@@ -634,6 +643,69 @@ public class CxGridRendererPackageImpl extends EPackageImpl implements CxGridRen
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCxGridNestedConverter() {
+		return cxGridNestedConverterEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCxGridNestedConverter_NestedDotPath() {
+		return (EAttribute)cxGridNestedConverterEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCxGridNestedConverter_BaseType() {
+		return (EAttribute)cxGridNestedConverterEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCxGridNestedConverter_BaseTypeQualifiedName() {
+		return (EAttribute)cxGridNestedConverterEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCxGridNestedConverter_NestedType() {
+		return (EAttribute)cxGridNestedConverterEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCxGridNestedConverter_NestedTypeQualifiedName() {
+		return (EAttribute)cxGridNestedConverterEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCxGridNestedConverter_NestedTypeConverter() {
+		return (EReference)cxGridNestedConverterEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @return the cx grid renderer factory
@@ -715,6 +787,14 @@ public class CxGridRendererPackageImpl extends EPackageImpl implements CxGridRen
 		cxGridIndicatorRendererEClass = createEClass(CX_GRID_INDICATOR_RENDERER);
 		createEAttribute(cxGridIndicatorRendererEClass, CX_GRID_INDICATOR_RENDERER__RED_ENDS);
 		createEAttribute(cxGridIndicatorRendererEClass, CX_GRID_INDICATOR_RENDERER__GREEN_STARTS);
+
+		cxGridNestedConverterEClass = createEClass(CX_GRID_NESTED_CONVERTER);
+		createEAttribute(cxGridNestedConverterEClass, CX_GRID_NESTED_CONVERTER__NESTED_DOT_PATH);
+		createEAttribute(cxGridNestedConverterEClass, CX_GRID_NESTED_CONVERTER__BASE_TYPE);
+		createEAttribute(cxGridNestedConverterEClass, CX_GRID_NESTED_CONVERTER__BASE_TYPE_QUALIFIED_NAME);
+		createEAttribute(cxGridNestedConverterEClass, CX_GRID_NESTED_CONVERTER__NESTED_TYPE);
+		createEAttribute(cxGridNestedConverterEClass, CX_GRID_NESTED_CONVERTER__NESTED_TYPE_QUALIFIED_NAME);
+		createEReference(cxGridNestedConverterEClass, CX_GRID_NESTED_CONVERTER__NESTED_TYPE_CONVERTER);
 	}
 
 	/**
@@ -764,6 +844,7 @@ public class CxGridRendererPackageImpl extends EPackageImpl implements CxGridRen
 		cxGridQuantityRendererEClass.getESuperTypes().add(this.getCxGridRenderer());
 		cxGridPriceRendererEClass.getESuperTypes().add(this.getCxGridRenderer());
 		cxGridIndicatorRendererEClass.getESuperTypes().add(this.getCxGridRenderer());
+		cxGridNestedConverterEClass.getESuperTypes().add(theCoreModelPackage.getYConverter());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(cxGridRendererEClass, CxGridRenderer.class, "CxGridRenderer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -823,6 +904,20 @@ public class CxGridRendererPackageImpl extends EPackageImpl implements CxGridRen
 		initEClass(cxGridIndicatorRendererEClass, CxGridIndicatorRenderer.class, "CxGridIndicatorRenderer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getCxGridIndicatorRenderer_RedEnds(), ecorePackage.getEDouble(), "redEnds", null, 0, 1, CxGridIndicatorRenderer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCxGridIndicatorRenderer_GreenStarts(), ecorePackage.getEDouble(), "greenStarts", null, 0, 1, CxGridIndicatorRenderer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cxGridNestedConverterEClass, CxGridNestedConverter.class, "CxGridNestedConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCxGridNestedConverter_NestedDotPath(), ecorePackage.getEString(), "nestedDotPath", null, 0, 1, CxGridNestedConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass());
+		EGenericType g2 = createEGenericType();
+		g1.getETypeArguments().add(g2);
+		initEAttribute(getCxGridNestedConverter_BaseType(), g1, "baseType", null, 0, 1, CxGridNestedConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCxGridNestedConverter_BaseTypeQualifiedName(), ecorePackage.getEString(), "baseTypeQualifiedName", null, 0, 1, CxGridNestedConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		g1 = createEGenericType(ecorePackage.getEJavaClass());
+		g2 = createEGenericType();
+		g1.getETypeArguments().add(g2);
+		initEAttribute(getCxGridNestedConverter_NestedType(), g1, "nestedType", null, 0, 1, CxGridNestedConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCxGridNestedConverter_NestedTypeQualifiedName(), ecorePackage.getEString(), "nestedTypeQualifiedName", null, 0, 1, CxGridNestedConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCxGridNestedConverter_NestedTypeConverter(), theCoreModelPackage.getYConverter(), null, "nestedTypeConverter", null, 0, 1, CxGridNestedConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 	}
 
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/util/CxGridRendererAdapterFactory.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/util/CxGridRendererAdapterFactory.java
index 797e5fc..3504ca7 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/util/CxGridRendererAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/util/CxGridRendererAdapterFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
+import org.eclipse.osbp.ecview.core.common.model.core.YConverter;
 import org.eclipse.osbp.ecview.core.common.model.core.YElement;
 import org.eclipse.osbp.ecview.core.common.model.core.YTaggable;
 
@@ -141,6 +142,10 @@ public class CxGridRendererAdapterFactory extends AdapterFactoryImpl {
 				return createCxGridIndicatorRendererAdapter();
 			}
 			@Override
+			public Adapter caseCxGridNestedConverter(CxGridNestedConverter object) {
+				return createCxGridNestedConverterAdapter();
+			}
+			@Override
 			public Adapter caseYTaggable(YTaggable object) {
 				return createYTaggableAdapter();
 			}
@@ -153,6 +158,10 @@ public class CxGridRendererAdapterFactory extends AdapterFactoryImpl {
 				return createCxGridProviderAdapter();
 			}
 			@Override
+			public Adapter caseYConverter(YConverter object) {
+				return createYConverterAdapter();
+			}
+			@Override
 			public Adapter defaultCase(EObject object) {
 				return createEObjectAdapter();
 			}
@@ -369,6 +378,20 @@ public class CxGridRendererAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter <em>Cx Grid Nested Converter</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 org.eclipse.osbp.ecview.extension.grid.renderer.CxGridNestedConverter
+	 * @generated
+	 */
+	public Adapter createCxGridNestedConverterAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.core.YTaggable <em>YTaggable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -411,6 +434,20 @@ public class CxGridRendererAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.core.YConverter <em>YConverter</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 org.eclipse.osbp.ecview.core.common.model.core.YConverter
+	 * @generated
+	 */
+	public Adapter createYConverterAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/util/CxGridRendererSwitch.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/util/CxGridRendererSwitch.java
index f1bb3aa..562f008 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/util/CxGridRendererSwitch.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/renderer/util/CxGridRendererSwitch.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
+import org.eclipse.osbp.ecview.core.common.model.core.YConverter;
 import org.eclipse.osbp.ecview.core.common.model.core.YElement;
 import org.eclipse.osbp.ecview.core.common.model.core.YTaggable;
 
@@ -216,6 +217,15 @@ public class CxGridRendererSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case CxGridRendererPackage.CX_GRID_NESTED_CONVERTER: {
+				CxGridNestedConverter cxGridNestedConverter = (CxGridNestedConverter)theEObject;
+				T result = caseCxGridNestedConverter(cxGridNestedConverter);
+				if (result == null) result = caseYConverter(cxGridNestedConverter);
+				if (result == null) result = caseYElement(cxGridNestedConverter);
+				if (result == null) result = caseYTaggable(cxGridNestedConverter);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -431,6 +441,21 @@ public class CxGridRendererSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cx Grid Nested Converter</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>Cx Grid Nested Converter</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCxGridNestedConverter(CxGridNestedConverter object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>YTaggable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -476,6 +501,21 @@ public class CxGridRendererSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>YConverter</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>YConverter</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseYConverter(YConverter object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/util/CxGridUtil.java b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/util/CxGridUtil.java
index 45d037d..cd42891 100644
--- a/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/util/CxGridUtil.java
+++ b/org.eclipse.osbp.ecview.extension.grid.model/src/org/eclipse/osbp/ecview/extension/grid/util/CxGridUtil.java
@@ -13,9 +13,12 @@
  */
 package org.eclipse.osbp.ecview.extension.grid.util;
 
+import java.lang.reflect.Field;
+
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.osbp.ecview.extension.grid.CxGrid;
 import org.eclipse.osbp.ecview.extension.grid.CxGridColumn;
+import org.eclipse.osbp.runtime.common.annotations.DtoUtils;
 import org.eclipse.osbp.ui.api.useraccess.AbstractAuthorization.Action;
 import org.eclipse.osbp.ui.api.useraccess.AbstractAuthorization.Group;
 import org.eclipse.osbp.ui.api.useraccess.IUserAccessService;
@@ -56,24 +59,46 @@ public class CxGridUtil {
 		if (userAccessService == null) {
 			grid.setVisible(true);
 		} else {
-			String dtoName = grid.getTypeQualifiedName();
+			Class<?> dtoObjectClass = grid.getType();
 			for (CxGridColumn column : grid.getColumns()) {
 				String dtoProperty = column.getPropertyId();
-				if (userAccessService.isGranted(Group.DTO, Action.READABLE, dtoName)) {
-					column.setHidden(false);
-					column.setEditable(true);
-					boolean columnHidden = userAccessService.isVetoed(Group.DTO, Action.INVISIBLE ,dtoName, dtoProperty);
-					if (!columnHidden) {
-						boolean columnEditable = !userAccessService.isVetoed(Group.DTO, Action.NONEDITABLE ,dtoName, dtoProperty);
-						boolean columnEnabled = !userAccessService.isVetoed(Group.DTO, Action.DISABLED ,dtoName, dtoProperty);
+				columnPermission(userAccessService, dtoObjectClass, column, dtoProperty);
+			}
+		}
+		return grid;
+	}
+
+
+	private static void columnPermission(IUserAccessService userAccessService, Class<?> dtoObjectClass, CxGridColumn column, String dtoProperty) {
+		if (dtoProperty.split("\\.").length > 1) {
+			String refName = dtoProperty.split("\\.")[0];
+			String newDtoProperty = dtoProperty.substring(dtoProperty.indexOf(".") + 1);
+			for (Field ref : DtoUtils.getOwnerDomainReferences(dtoObjectClass)){
+				if (refName.equals(ref.getName())){
+					Class<?> newDtoObjectClass = ref.getType();
+					columnPermission(userAccessService, newDtoObjectClass, column, newDtoProperty);
+					break;
+				}
+			}
+		} else {
+			String dtoName = dtoObjectClass.getCanonicalName();
+			if (userAccessService.isGranted(Group.DTO, Action.READABLE, dtoName)) {
+				boolean columnHidden = userAccessService.isVetoed(Group.DTO, Action.INVISIBLE ,dtoName, dtoProperty);
+				if (!columnHidden) {
+					boolean columnEditable = !userAccessService.isVetoed(Group.DTO, Action.NONEDITABLE ,dtoName, dtoProperty);
+					boolean columnEnabled = !userAccessService.isVetoed(Group.DTO, Action.DISABLED ,dtoName, dtoProperty);
+					if(column.isEditable()) {
+						// do not set editable true, if editable false
 						column.setEditable(columnEditable && columnEnabled);
-					} else {
+					}
+				} else {
+					if(!column.isHidden()){
+						// do not unhide hidden columns
 						column.setHidden(columnHidden);
 					}
 				}
 			}
 		}
-		return grid;
 	}
 
 }
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/.project b/org.eclipse.osbp.ecview.extension.model.edit/.project
index bb250e4..429c366 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/.project
+++ b/org.eclipse.osbp.ecview.extension.model.edit/.project
@@ -20,15 +20,9 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.babel.editor.rbeBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.babel.editor.rbeNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYDialog_content_YI18nComboBox.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYDialog_content_YI18nComboBox.gif
new file mode 100644
index 0000000..de48ec6
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYDialog_content_YI18nComboBox.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYLayout_elements_YI18nComboBox.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYLayout_elements_YI18nComboBox.gif
new file mode 100644
index 0000000..2084fe8
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYLayout_elements_YI18nComboBox.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYLayoutingInfo_content_YI18nComboBox.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYLayoutingInfo_content_YI18nComboBox.gif
new file mode 100644
index 0000000..9ab92c1
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYLayoutingInfo_content_YI18nComboBox.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYLayoutingInfo_content_YKanban.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYLayoutingInfo_content_YKanban.gif
new file mode 100644
index 0000000..04a6748
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYLayoutingInfo_content_YKanban.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYMasterDetail_detailElement_YI18nComboBox.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYMasterDetail_detailElement_YI18nComboBox.gif
new file mode 100644
index 0000000..5095ded
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYMasterDetail_detailElement_YI18nComboBox.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYMasterDetail_masterElement_YI18nComboBox.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYMasterDetail_masterElement_YI18nComboBox.gif
new file mode 100644
index 0000000..5095ded
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYMasterDetail_masterElement_YI18nComboBox.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYSuspectInfo_visibilityProcessors_YKanbanVisibilityProcessor.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYSuspectInfo_visibilityProcessors_YKanbanVisibilityProcessor.gif
new file mode 100644
index 0000000..5f45cab
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYSuspectInfo_visibilityProcessors_YKanbanVisibilityProcessor.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYSuspect_visibilityProcessors_YKanbanVisibilityProcessor.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYSuspect_visibilityProcessors_YKanbanVisibilityProcessor.gif
new file mode 100644
index 0000000..56becf8
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYSuspect_visibilityProcessors_YKanbanVisibilityProcessor.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYTab_embeddable_YI18nComboBox.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYTab_embeddable_YI18nComboBox.gif
new file mode 100644
index 0000000..912568a
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYTab_embeddable_YI18nComboBox.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYView_content_YI18nComboBox.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYView_content_YI18nComboBox.gif
new file mode 100644
index 0000000..35b22bb
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/ctool16/CreateYView_content_YI18nComboBox.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/obj16/YI18nComboBox.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/obj16/YI18nComboBox.gif
new file mode 100644
index 0000000..14af8aa
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/obj16/YI18nComboBox.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/icons/full/obj16/YVaaclipseUiThemeToStringConverter.gif b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/obj16/YVaaclipseUiThemeToStringConverter.gif
new file mode 100644
index 0000000..db7414e
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/icons/full/obj16/YVaaclipseUiThemeToStringConverter.gif
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/plugin.properties b/org.eclipse.osbp.ecview.extension.model.edit/plugin.properties
index c859d0b..335a173 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/plugin.properties
+++ b/org.eclipse.osbp.ecview.extension.model.edit/plugin.properties
@@ -186,3 +186,11 @@ _UI_YPairComboBox_descriptionProperty_feature = Description Property
 _UI_YPairComboBox_description_feature = Description
 >>>>>>> branch 'development' of ssh://lunifera@80.156.28.28/osbpgit/org.eclipse.osbp.ecview.extension.git
 _UI_YSuspect_containerValueBindingEndpoint_feature = Container Value Binding Endpoint
+_UI_YI18nComboBox_type = YI1 8n Combo Box
+_UI_YVaaclipseUiThemeToStringConverter_type = YVaaclipse Ui Theme To String Converter
+_UI_YI18nComboBox_datadescription_feature = Datadescription
+_UI_YI18nComboBox_datatype_feature = Datatype
+_UI_YI18nComboBox_selection_feature = Selection
+_UI_YI18nComboBox_type_feature = Type
+_UI_YI18nComboBox_emfNsURI_feature = Emf Ns URI
+_UI_YI18nComboBox_typeQualifiedName_feature = Type Qualified Name
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/converter/provider/YConverterItemProviderAdapterFactory.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/converter/provider/YConverterItemProviderAdapterFactory.java
index 29587af..80fef0c 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/converter/provider/YConverterItemProviderAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/converter/provider/YConverterItemProviderAdapterFactory.java
@@ -334,6 +334,29 @@ public class YConverterItemProviderAdapterFactory extends YConverterAdapterFacto
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.extension.model.converter.YVaaclipseUiThemeToStringConverter} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YVaaclipseUiThemeToStringConverterItemProvider yVaaclipseUiThemeToStringConverterItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.extension.model.converter.YVaaclipseUiThemeToStringConverter}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createYVaaclipseUiThemeToStringConverterAdapter() {
+		if (yVaaclipseUiThemeToStringConverterItemProvider == null) {
+			yVaaclipseUiThemeToStringConverterItemProvider = new YVaaclipseUiThemeToStringConverterItemProvider(this);
+		}
+
+		return yVaaclipseUiThemeToStringConverterItemProvider;
+	}
+
+	/**
 	 * This returns the root adapter factory that contains this factory. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -455,6 +478,7 @@ public class YConverterItemProviderAdapterFactory extends YConverterAdapterFacto
 		if (yNumericToUomoConverterItemProvider != null) yNumericToUomoConverterItemProvider.dispose();
 		if (yDecimalToUomoConverterItemProvider != null) yDecimalToUomoConverterItemProvider.dispose();
 		if (ySimpleDecimalConverterItemProvider != null) ySimpleDecimalConverterItemProvider.dispose();
+		if (yVaaclipseUiThemeToStringConverterItemProvider != null) yVaaclipseUiThemeToStringConverterItemProvider.dispose();
 	}
 
 }
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/converter/provider/YVaaclipseUiThemeToStringConverterItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/converter/provider/YVaaclipseUiThemeToStringConverterItemProvider.java
new file mode 100644
index 0000000..622c5db
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/converter/provider/YVaaclipseUiThemeToStringConverterItemProvider.java
@@ -0,0 +1,262 @@
+/**
+ * All rights reserved by Loetz GmbH und CoKG Heidelberg 2015.
+ * 
+ * Contributors:
+ *       Florian Pirchner - initial API and implementation
+ */
+package org.eclipse.osbp.ecview.extension.model.converter.provider;
+
+
+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.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.osbp.ecview.core.common.model.core.CoreModelFactory;
+import org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage;
+
+import org.eclipse.osbp.ecview.extension.model.converter.YConverterPackage;
+import org.eclipse.osbp.ecview.extension.model.converter.YVaaclipseUiThemeToStringConverter;
+
+import org.eclipse.osbp.ecview.extension.model.provider.ecviewEditPlugin;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.osbp.ecview.extension.model.converter.YVaaclipseUiThemeToStringConverter} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class YVaaclipseUiThemeToStringConverterItemProvider 
+	extends ItemProviderAdapter
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "All rights reserved by Loetz GmbH und CoKG Heidelberg 2015.\n\nContributors:\n      Florian Pirchner - initial API and implementation";
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YVaaclipseUiThemeToStringConverterItemProvider(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);
+
+			addTagsPropertyDescriptor(object);
+			addIdPropertyDescriptor(object);
+			addNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Tags feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTagsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YTaggable_tags_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YTaggable_tags_feature", "_UI_YTaggable_type"),
+				 CoreModelPackage.Literals.YTAGGABLE__TAGS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Id feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YElement_id_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YElement_id_feature", "_UI_YElement_type"),
+				 CoreModelPackage.Literals.YELEMENT__ID,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * 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_YElement_name_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YElement_name_feature", "_UI_YElement_type"),
+				 CoreModelPackage.Literals.YELEMENT__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(CoreModelPackage.Literals.YELEMENT__PROPERTIES);
+		}
+		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 YVaaclipseUiThemeToStringConverter.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/YVaaclipseUiThemeToStringConverter"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((YVaaclipseUiThemeToStringConverter)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_YVaaclipseUiThemeToStringConverter_type") :
+			getString("_UI_YVaaclipseUiThemeToStringConverter_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(YVaaclipseUiThemeToStringConverter.class)) {
+			case YConverterPackage.YVAACLIPSE_UI_THEME_TO_STRING_CONVERTER__TAGS:
+			case YConverterPackage.YVAACLIPSE_UI_THEME_TO_STRING_CONVERTER__ID:
+			case YConverterPackage.YVAACLIPSE_UI_THEME_TO_STRING_CONVERTER__NAME:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case YConverterPackage.YVAACLIPSE_UI_THEME_TO_STRING_CONVERTER__PROPERTIES:
+				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
+				(CoreModelPackage.Literals.YELEMENT__PROPERTIES,
+				 CoreModelFactory.eINSTANCE.create(CoreModelPackage.Literals.YSTRING_TO_STRING_MAP)));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return ecviewEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YBlobUploadComponentItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YBlobUploadComponentItemProvider.java
index e6b8405..12312e5 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YBlobUploadComponentItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YBlobUploadComponentItemProvider.java
@@ -298,6 +298,11 @@ public class YBlobUploadComponentItemProvider extends YInputItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YContentSensitiveLayoutItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YContentSensitiveLayoutItemProvider.java
index 39a14d8..a1d17c3 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YContentSensitiveLayoutItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YContentSensitiveLayoutItemProvider.java
@@ -263,6 +263,11 @@ public class YContentSensitiveLayoutItemProvider extends YLayoutItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 YECviewFactory.eINSTANCE.createYI18nComboBox()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
 				 YECviewFactory.eINSTANCE.createYIconComboBox()));
 
 		newChildDescriptors.add
@@ -473,12 +478,12 @@ public class YContentSensitiveLayoutItemProvider extends YLayoutItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
-				 ExtensionModelFactory.eINSTANCE.createYEnumList()));
+				 ExtensionModelFactory.eINSTANCE.createYEnumComboBox()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
-				 ExtensionModelFactory.eINSTANCE.createYEnumComboBox()));
+				 ExtensionModelFactory.eINSTANCE.createYEnumList()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -504,6 +509,11 @@ public class YContentSensitiveLayoutItemProvider extends YLayoutItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
 				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYKanban()));
 	}
 
 }
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YCustomDecimalFieldItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YCustomDecimalFieldItemProvider.java
index 34f1a56..c3e878a 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YCustomDecimalFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YCustomDecimalFieldItemProvider.java
@@ -277,6 +277,11 @@ public class YCustomDecimalFieldItemProvider extends YInputItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YECviewItemProviderAdapterFactory.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YECviewItemProviderAdapterFactory.java
index 9cc61be..f959918 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YECviewItemProviderAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YECviewItemProviderAdapterFactory.java
@@ -462,6 +462,29 @@ public class YECviewItemProviderAdapterFactory extends YECviewAdapterFactory
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YI18nComboBoxItemProvider yi18nComboBoxItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createYI18nComboBoxAdapter() {
+		if (yi18nComboBoxItemProvider == null) {
+			yi18nComboBoxItemProvider = new YI18nComboBoxItemProvider(this);
+		}
+
+		return yi18nComboBoxItemProvider;
+	}
+
+	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.extension.model.YIconComboBox} instances.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
@@ -876,6 +899,7 @@ public class YECviewItemProviderAdapterFactory extends YECviewAdapterFactory
 		if (ySuspectInfoItemProvider != null) ySuspectInfoItemProvider.dispose();
 		if (yBlobUploadComponentItemProvider != null) yBlobUploadComponentItemProvider.dispose();
 		if (yCustomDecimalFieldItemProvider != null) yCustomDecimalFieldItemProvider.dispose();
+		if (yi18nComboBoxItemProvider != null) yi18nComboBoxItemProvider.dispose();
 		if (yIconComboBoxItemProvider != null) yIconComboBoxItemProvider.dispose();
 		if (yQuantityTextFieldItemProvider != null) yQuantityTextFieldItemProvider.dispose();
 		if (yCollectionSuspectItemProvider != null) yCollectionSuspectItemProvider.dispose();
@@ -958,6 +982,11 @@ public class YECviewItemProviderAdapterFactory extends YECviewAdapterFactory
 				newChildDescriptors.add
 					(createChildParameter
 						(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+						 YECviewFactory.eINSTANCE.createYI18nComboBox()));
+
+				newChildDescriptors.add
+					(createChildParameter
+						(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
 						 YECviewFactory.eINSTANCE.createYIconComboBox()));
 
 				newChildDescriptors.add
@@ -1031,6 +1060,11 @@ public class YECviewItemProviderAdapterFactory extends YECviewAdapterFactory
 				newChildDescriptors.add
 					(createChildParameter
 						(CoreModelPackage.Literals.YVIEW__CONTENT,
+						 YECviewFactory.eINSTANCE.createYI18nComboBox()));
+
+				newChildDescriptors.add
+					(createChildParameter
+						(CoreModelPackage.Literals.YVIEW__CONTENT,
 						 YECviewFactory.eINSTANCE.createYIconComboBox()));
 
 				newChildDescriptors.add
@@ -1104,6 +1138,11 @@ public class YECviewItemProviderAdapterFactory extends YECviewAdapterFactory
 				newChildDescriptors.add
 					(createChildParameter
 						(CoreModelPackage.Literals.YDIALOG__CONTENT,
+						 YECviewFactory.eINSTANCE.createYI18nComboBox()));
+
+				newChildDescriptors.add
+					(createChildParameter
+						(CoreModelPackage.Literals.YDIALOG__CONTENT,
 						 YECviewFactory.eINSTANCE.createYIconComboBox()));
 
 				newChildDescriptors.add
@@ -1264,6 +1303,11 @@ public class YECviewItemProviderAdapterFactory extends YECviewAdapterFactory
 				newChildDescriptors.add
 					(createChildParameter
 						(ExtensionModelPackage.Literals.YTAB__EMBEDDABLE,
+						 YECviewFactory.eINSTANCE.createYI18nComboBox()));
+
+				newChildDescriptors.add
+					(createChildParameter
+						(ExtensionModelPackage.Literals.YTAB__EMBEDDABLE,
 						 YECviewFactory.eINSTANCE.createYIconComboBox()));
 
 				newChildDescriptors.add
@@ -1337,6 +1381,11 @@ public class YECviewItemProviderAdapterFactory extends YECviewAdapterFactory
 				newChildDescriptors.add
 					(createChildParameter
 						(ExtensionModelPackage.Literals.YMASTER_DETAIL__MASTER_ELEMENT,
+						 YECviewFactory.eINSTANCE.createYI18nComboBox()));
+
+				newChildDescriptors.add
+					(createChildParameter
+						(ExtensionModelPackage.Literals.YMASTER_DETAIL__MASTER_ELEMENT,
 						 YECviewFactory.eINSTANCE.createYIconComboBox()));
 
 				newChildDescriptors.add
@@ -1397,6 +1446,11 @@ public class YECviewItemProviderAdapterFactory extends YECviewAdapterFactory
 				newChildDescriptors.add
 					(createChildParameter
 						(ExtensionModelPackage.Literals.YMASTER_DETAIL__DETAIL_ELEMENT,
+						 YECviewFactory.eINSTANCE.createYI18nComboBox()));
+
+				newChildDescriptors.add
+					(createChildParameter
+						(ExtensionModelPackage.Literals.YMASTER_DETAIL__DETAIL_ELEMENT,
 						 YECviewFactory.eINSTANCE.createYIconComboBox()));
 
 				newChildDescriptors.add
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YI18nComboBoxItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YI18nComboBoxItemProvider.java
new file mode 100644
index 0000000..069c618
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YI18nComboBoxItemProvider.java
@@ -0,0 +1,386 @@
+/**
+ * All rights reserved by Loetz GmbH und CoKG Heidelberg 2015.
+ * 
+ * Contributors:
+ *       Florian Pirchner - initial API and implementation
+ */
+package org.eclipse.osbp.ecview.extension.model.provider;
+
+
+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;
+
+import org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage;
+
+import org.eclipse.osbp.ecview.core.extension.model.extension.provider.YInputItemProvider;
+
+import org.eclipse.osbp.ecview.extension.model.YECviewPackage;
+import org.eclipse.osbp.ecview.extension.model.YI18nComboBox;
+
+import org.eclipse.osbp.ecview.extension.model.converter.YConverterFactory;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class YI18nComboBoxItemProvider extends YInputItemProvider {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "All rights reserved by Loetz GmbH und CoKG Heidelberg 2015.\n\nContributors:\n      Florian Pirchner - initial API and implementation";
+
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YI18nComboBoxItemProvider(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);
+
+			addCollectionBindingEndpointPropertyDescriptor(object);
+			addSelectionBindingEndpointPropertyDescriptor(object);
+			addDatadescriptionPropertyDescriptor(object);
+			addDatatypePropertyDescriptor(object);
+			addSelectionPropertyDescriptor(object);
+			addTypePropertyDescriptor(object);
+			addEmfNsURIPropertyDescriptor(object);
+			addTypeQualifiedNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Collection Binding Endpoint feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addCollectionBindingEndpointPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YCollectionBindable_collectionBindingEndpoint_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YCollectionBindable_collectionBindingEndpoint_feature", "_UI_YCollectionBindable_type"),
+				 CoreModelPackage.Literals.YCOLLECTION_BINDABLE__COLLECTION_BINDING_ENDPOINT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Selection Binding Endpoint feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSelectionBindingEndpointPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YSelectionBindable_selectionBindingEndpoint_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YSelectionBindable_selectionBindingEndpoint_feature", "_UI_YSelectionBindable_type"),
+				 CoreModelPackage.Literals.YSELECTION_BINDABLE__SELECTION_BINDING_ENDPOINT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Datadescription feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDatadescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YI18nComboBox_datadescription_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YI18nComboBox_datadescription_feature", "_UI_YI18nComboBox_type"),
+				 YECviewPackage.Literals.YI1_8N_COMBO_BOX__DATADESCRIPTION,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Datatype feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDatatypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YI18nComboBox_datatype_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YI18nComboBox_datatype_feature", "_UI_YI18nComboBox_type"),
+				 YECviewPackage.Literals.YI1_8N_COMBO_BOX__DATATYPE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Selection feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSelectionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YI18nComboBox_selection_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YI18nComboBox_selection_feature", "_UI_YI18nComboBox_type"),
+				 YECviewPackage.Literals.YI1_8N_COMBO_BOX__SELECTION,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YI18nComboBox_type_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YI18nComboBox_type_feature", "_UI_YI18nComboBox_type"),
+				 YECviewPackage.Literals.YI1_8N_COMBO_BOX__TYPE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Emf Ns URI feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addEmfNsURIPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YI18nComboBox_emfNsURI_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YI18nComboBox_emfNsURI_feature", "_UI_YI18nComboBox_type"),
+				 YECviewPackage.Literals.YI1_8N_COMBO_BOX__EMF_NS_URI,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Type Qualified Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTypeQualifiedNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YI18nComboBox_typeQualifiedName_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YI18nComboBox_typeQualifiedName_feature", "_UI_YI18nComboBox_type"),
+				 YECviewPackage.Literals.YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns YI18nComboBox.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/YI18nComboBox"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((YI18nComboBox)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_YI18nComboBox_type") :
+			getString("_UI_YI18nComboBox_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(YI18nComboBox.class)) {
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION:
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE:
+			case YECviewPackage.YI1_8N_COMBO_BOX__EMF_NS_URI:
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME:
+				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);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYObjectToStringConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYCustomDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYNumericToResourceConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYStringToResourceConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYPriceToStringConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYQuantityToStringConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYNumericToUomoConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYDecimalToUomoConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
+	}
+
+	/**
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+		Object childFeature = feature;
+		Object childObject = child;
+
+		boolean qualify =
+			childFeature == CoreModelPackage.Literals.YFIELD__VALIDATORS ||
+			childFeature == CoreModelPackage.Literals.YFIELD__INTERNAL_VALIDATORS;
+
+		if (qualify) {
+			return getString
+				("_UI_CreateChild_text2",
+				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		}
+		return super.getCreateChildText(owner, feature, child, selection);
+	}
+
+}
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YIconComboBoxItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YIconComboBoxItemProvider.java
index 8d0c295..c017f17 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YIconComboBoxItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YIconComboBoxItemProvider.java
@@ -513,6 +513,11 @@ public class YIconComboBoxItemProvider extends YInputItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YLayoutingInfoItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YLayoutingInfoItemProvider.java
index 702eabf..220e5e0 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YLayoutingInfoItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YLayoutingInfoItemProvider.java
@@ -332,6 +332,11 @@ public class YLayoutingInfoItemProvider extends ItemProviderAdapter implements
 		newChildDescriptors.add
 			(createChildParameter
 				(YECviewPackage.Literals.YLAYOUTING_INFO__CONTENT,
+				 YECviewFactory.eINSTANCE.createYI18nComboBox()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(YECviewPackage.Literals.YLAYOUTING_INFO__CONTENT,
 				 YECviewFactory.eINSTANCE.createYIconComboBox()));
 
 		newChildDescriptors.add
@@ -562,12 +567,12 @@ public class YLayoutingInfoItemProvider extends ItemProviderAdapter implements
 		newChildDescriptors.add
 			(createChildParameter
 				(YECviewPackage.Literals.YLAYOUTING_INFO__CONTENT,
-				 ExtensionModelFactory.eINSTANCE.createYEnumList()));
+				 ExtensionModelFactory.eINSTANCE.createYEnumComboBox()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(YECviewPackage.Literals.YLAYOUTING_INFO__CONTENT,
-				 ExtensionModelFactory.eINSTANCE.createYEnumComboBox()));
+				 ExtensionModelFactory.eINSTANCE.createYEnumList()));
 
 		newChildDescriptors.add
 			(createChildParameter
@@ -596,6 +601,11 @@ public class YLayoutingInfoItemProvider extends ItemProviderAdapter implements
 
 		newChildDescriptors.add
 			(createChildParameter
+				(YECviewPackage.Literals.YLAYOUTING_INFO__CONTENT,
+				 ExtensionModelFactory.eINSTANCE.createYKanban()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(YECviewPackage.Literals.YLAYOUTING_INFO__ACTIVE_SUSPECT_INFOS,
 				 YECviewFactory.eINSTANCE.createYSuspectInfo()));
 	}
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedDecimalFieldItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedDecimalFieldItemProvider.java
index a14281d..db0bcc4 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedDecimalFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedDecimalFieldItemProvider.java
@@ -307,6 +307,11 @@ public class YMaskedDecimalFieldItemProvider extends YInputItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedNumericFieldItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedNumericFieldItemProvider.java
index 8af9ba7..125236f 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedNumericFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedNumericFieldItemProvider.java
@@ -259,6 +259,11 @@ public class YMaskedNumericFieldItemProvider extends YInputItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedTextFieldItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedTextFieldItemProvider.java
index ea8d25e..e7c12a9 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedTextFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YMaskedTextFieldItemProvider.java
@@ -259,6 +259,11 @@ public class YMaskedTextFieldItemProvider extends YInputItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YPairComboBoxItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YPairComboBoxItemProvider.java
index 0eb699c..66feeba 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YPairComboBoxItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YPairComboBoxItemProvider.java
@@ -499,6 +499,11 @@ public class YPairComboBoxItemProvider extends YInputItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YPrefixedMaskedTextFieldItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YPrefixedMaskedTextFieldItemProvider.java
index 4c73052..5f88e7c 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YPrefixedMaskedTextFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YPrefixedMaskedTextFieldItemProvider.java
@@ -298,6 +298,11 @@ public class YPrefixedMaskedTextFieldItemProvider extends YInputItemProvider {
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(YECviewPackage.Literals.YPREFIXED_MASKED_TEXT_FIELD__PREFIXES,
 				 CoreModelFactory.eINSTANCE.create(CoreModelPackage.Literals.YSTRING_TO_STRING_MAP)));
 	}
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YQuantityTextFieldItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YQuantityTextFieldItemProvider.java
index 07eba88..bdbb2cb 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YQuantityTextFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YQuantityTextFieldItemProvider.java
@@ -252,6 +252,11 @@ public class YQuantityTextFieldItemProvider extends YInputItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YRichTextAreaItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YRichTextAreaItemProvider.java
index e8a58e0..2fb4285 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YRichTextAreaItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YRichTextAreaItemProvider.java
@@ -283,6 +283,11 @@ public class YRichTextAreaItemProvider extends YInputItemProvider {
 			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 YConverterFactory.eINSTANCE.createYSimpleDecimalConverter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__CONVERTER,
+				 YConverterFactory.eINSTANCE.createYVaaclipseUiThemeToStringConverter()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YSuspectInfoItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YSuspectInfoItemProvider.java
index a867445..a96a216 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YSuspectInfoItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YSuspectInfoItemProvider.java
@@ -45,6 +45,7 @@ import org.eclipse.osbp.ecview.core.common.model.binding.BindingFactory;
 import org.eclipse.osbp.ecview.core.common.model.core.CoreModelFactory;
 import org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage;
 import org.eclipse.osbp.ecview.core.common.model.visibility.VisibilityFactory;
+import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.osbp.ecview.extension.model.YSuspectInfo} object.
@@ -405,6 +406,11 @@ public class YSuspectInfoItemProvider
 			(createChildParameter
 				(YECviewPackage.Literals.YSUSPECT_INFO__VISIBILITY_PROCESSORS,
 				 VisibilityFactory.eINSTANCE.createYVisibilityProcessor()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(YECviewPackage.Literals.YSUSPECT_INFO__VISIBILITY_PROCESSORS,
+				 ExtensionModelFactory.eINSTANCE.createYKanbanVisibilityProcessor()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YSuspectItemProvider.java b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YSuspectItemProvider.java
index 87f5172..8271045 100644
--- a/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YSuspectItemProvider.java
+++ b/org.eclipse.osbp.ecview.extension.model.edit/src/org/eclipse/osbp/ecview/extension/model/provider/YSuspectItemProvider.java
@@ -536,6 +536,11 @@ public class YSuspectItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
+				(YECviewPackage.Literals.YSUSPECT__VISIBILITY_PROCESSORS,
+				 ExtensionModelFactory.eINSTANCE.createYKanbanVisibilityProcessor()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(YECviewPackage.Literals.YSUSPECT__COMMANDS,
 				 CoreModelFactory.eINSTANCE.createYOpenDialogCommand()));
 
diff --git a/org.eclipse.osbp.ecview.extension.model/model/ecview.ecore b/org.eclipse.osbp.ecview.extension.model/model/ecview.ecore
index ad1e3dc..a34307a 100644
--- a/org.eclipse.osbp.ecview.extension.model/model/ecview.ecore
+++ b/org.eclipse.osbp.ecview.extension.model/model/ecview.ecore
@@ -108,6 +108,19 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
         transient="true"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="YI18nComboBox" eSuperTypes="../../org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.extension.model/model/extdatatypes.ecore#//YComboBoxDatatype"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="selection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
+      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfNsURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="YIconComboBox" eSuperTypes="../../org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YCollectionBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YSelectionBindable ../../org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore#//YBeanServiceConsumer">
     <eStructuralFeatures xsi:type="ecore:EReference" name="datadescription" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.common.model/model/datatypes.ecore#//YDatadescription"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass ../../org.eclipse.osbp.ecview.core.extension.model/model/extdatatypes.ecore#//YComboBoxDatatype"/>
diff --git a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YECviewFactory.java b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YECviewFactory.java
index 37b03d1..7346289 100644
--- a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YECviewFactory.java
+++ b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YECviewFactory.java
@@ -176,6 +176,15 @@ public interface YECviewFactory extends EFactory {
 	YCustomDecimalField createYCustomDecimalField();
 
 	/**
+	 * Returns a new object of class '<em>YI1 8n Combo Box</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>YI1 8n Combo Box</em>'.
+	 * @generated
+	 */
+	YI18nComboBox createYI18nComboBox();
+
+	/**
 	 * Returns a new object of class '<em>YIcon Combo Box</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YECviewPackage.java b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YECviewPackage.java
index 2ab991f..47acd82 100644
--- a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YECviewPackage.java
+++ b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YECviewPackage.java
@@ -2335,6 +2335,340 @@ public interface YECviewPackage extends EPackage {
 
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl <em>YI1 8n Combo Box</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl
+	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYI18nComboBox()
+	 * @generated
+	 */
+	int YI1_8N_COMBO_BOX = 15;
+
+	/**
+	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__TAGS = ExtensionModelPackage.YINPUT__TAGS;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__ID = ExtensionModelPackage.YINPUT__ID;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__NAME = ExtensionModelPackage.YINPUT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__PROPERTIES = ExtensionModelPackage.YINPUT__PROPERTIES;
+
+	/**
+	 * The feature id for the '<em><b>Css Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__CSS_CLASS = ExtensionModelPackage.YINPUT__CSS_CLASS;
+
+	/**
+	 * The feature id for the '<em><b>Css ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__CSS_ID = ExtensionModelPackage.YINPUT__CSS_ID;
+
+	/**
+	 * The feature id for the '<em><b>Initial Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__INITIAL_VISIBLE = ExtensionModelPackage.YINPUT__INITIAL_VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__VISIBLE = ExtensionModelPackage.YINPUT__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Authorization Group</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__AUTHORIZATION_GROUP = ExtensionModelPackage.YINPUT__AUTHORIZATION_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Authorization Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__AUTHORIZATION_ID = ExtensionModelPackage.YINPUT__AUTHORIZATION_ID;
+
+	/**
+	 * The feature id for the '<em><b>Orphan Datatypes</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__ORPHAN_DATATYPES = ExtensionModelPackage.YINPUT__ORPHAN_DATATYPES;
+
+	/**
+	 * The feature id for the '<em><b>Orphan Datadescriptions</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__ORPHAN_DATADESCRIPTIONS = ExtensionModelPackage.YINPUT__ORPHAN_DATADESCRIPTIONS;
+
+	/**
+	 * The feature id for the '<em><b>Memento Enabled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__MEMENTO_ENABLED = ExtensionModelPackage.YINPUT__MEMENTO_ENABLED;
+
+	/**
+	 * The feature id for the '<em><b>Memento Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__MEMENTO_ID = ExtensionModelPackage.YINPUT__MEMENTO_ID;
+
+	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__LABEL = ExtensionModelPackage.YINPUT__LABEL;
+
+	/**
+	 * The feature id for the '<em><b>Label I1 8n Key</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__LABEL_I1_8N_KEY = ExtensionModelPackage.YINPUT__LABEL_I1_8N_KEY;
+
+	/**
+	 * The feature id for the '<em><b>Last Context Click</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__LAST_CONTEXT_CLICK = ExtensionModelPackage.YINPUT__LAST_CONTEXT_CLICK;
+
+	/**
+	 * The feature id for the '<em><b>Initial Editable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__INITIAL_EDITABLE = ExtensionModelPackage.YINPUT__INITIAL_EDITABLE;
+
+	/**
+	 * The feature id for the '<em><b>Editable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__EDITABLE = ExtensionModelPackage.YINPUT__EDITABLE;
+
+	/**
+	 * The feature id for the '<em><b>Initial Enabled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__INITIAL_ENABLED = ExtensionModelPackage.YINPUT__INITIAL_ENABLED;
+
+	/**
+	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__ENABLED = ExtensionModelPackage.YINPUT__ENABLED;
+
+	/**
+	 * The feature id for the '<em><b>Layout Idx</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__LAYOUT_IDX = ExtensionModelPackage.YINPUT__LAYOUT_IDX;
+
+	/**
+	 * The feature id for the '<em><b>Layout Columns</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__LAYOUT_COLUMNS = ExtensionModelPackage.YINPUT__LAYOUT_COLUMNS;
+
+	/**
+	 * The feature id for the '<em><b>Tab Index</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__TAB_INDEX = ExtensionModelPackage.YINPUT__TAB_INDEX;
+
+	/**
+	 * The feature id for the '<em><b>Validators</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__VALIDATORS = ExtensionModelPackage.YINPUT__VALIDATORS;
+
+	/**
+	 * The feature id for the '<em><b>Internal Validators</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__INTERNAL_VALIDATORS = ExtensionModelPackage.YINPUT__INTERNAL_VALIDATORS;
+
+	/**
+	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__CONVERTER = ExtensionModelPackage.YINPUT__CONVERTER;
+
+	/**
+	 * The feature id for the '<em><b>Collection Binding Endpoint</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT = ExtensionModelPackage.YINPUT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Selection Binding Endpoint</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT = ExtensionModelPackage.YINPUT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Datadescription</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__DATADESCRIPTION = ExtensionModelPackage.YINPUT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Datatype</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__DATATYPE = ExtensionModelPackage.YINPUT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Selection</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__SELECTION = ExtensionModelPackage.YINPUT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__TYPE = ExtensionModelPackage.YINPUT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Emf Ns URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__EMF_NS_URI = ExtensionModelPackage.YINPUT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Type Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME = ExtensionModelPackage.YINPUT_FEATURE_COUNT + 7;
+
+	/**
+	 * The number of structural features of the '<em>YI1 8n Combo Box</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YI1_8N_COMBO_BOX_FEATURE_COUNT = ExtensionModelPackage.YINPUT_FEATURE_COUNT + 8;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.extension.model.impl.YIconComboBoxImpl <em>YIcon Combo Box</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2342,7 +2676,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYIconComboBox()
 	 * @generated
 	 */
-	int YICON_COMBO_BOX = 15;
+	int YICON_COMBO_BOX = 16;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -2721,7 +3055,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYQuantityTextField()
 	 * @generated
 	 */
-	int YQUANTITY_TEXT_FIELD = 16;
+	int YQUANTITY_TEXT_FIELD = 17;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -3010,7 +3344,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYCollectionSuspect()
 	 * @generated
 	 */
-	int YCOLLECTION_SUSPECT = 17;
+	int YCOLLECTION_SUSPECT = 18;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -3191,7 +3525,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYColumnInfo()
 	 * @generated
 	 */
-	int YCOLUMN_INFO = 18;
+	int YCOLUMN_INFO = 19;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -3255,7 +3589,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYContentSensitiveLayout()
 	 * @generated
 	 */
-	int YCONTENT_SENSITIVE_LAYOUT = 19;
+	int YCONTENT_SENSITIVE_LAYOUT = 20;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -3508,7 +3842,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYRichTextArea()
 	 * @generated
 	 */
-	int YRICH_TEXT_AREA = 20;
+	int YRICH_TEXT_AREA = 21;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -3815,7 +4149,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYPairComboBox()
 	 * @generated
 	 */
-	int YPAIR_COMBO_BOX = 25;
+	int YPAIR_COMBO_BOX = 26;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.extension.model.impl.YMaskedTextFieldImpl <em>YMasked Text Field</em>}' class.
@@ -3825,7 +4159,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYMaskedTextField()
 	 * @generated
 	 */
-	int YMASKED_TEXT_FIELD = 21;
+	int YMASKED_TEXT_FIELD = 22;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -4123,7 +4457,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYPrefixedMaskedTextField()
 	 * @generated
 	 */
-	int YPREFIXED_MASKED_TEXT_FIELD = 22;
+	int YPREFIXED_MASKED_TEXT_FIELD = 23;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -4430,7 +4764,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYMaskedNumericField()
 	 * @generated
 	 */
-	int YMASKED_NUMERIC_FIELD = 23;
+	int YMASKED_NUMERIC_FIELD = 24;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -4728,7 +5062,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYMaskedDecimalField()
 	 * @generated
 	 */
-	int YMASKED_DECIMAL_FIELD = 24;
+	int YMASKED_DECIMAL_FIELD = 25;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -5422,7 +5756,7 @@ public interface YECviewPackage extends EPackage {
 	 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getNumber()
 	 * @generated
 	 */
-	int NUMBER = 26;
+	int NUMBER = 27;
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.extension.model.YStrategyLayout <em>YStrategy Layout</em>}'.
@@ -6015,6 +6349,82 @@ public interface YECviewPackage extends EPackage {
 	EAttribute getYCustomDecimalField_Value();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox <em>YI1 8n Combo Box</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>YI1 8n Combo Box</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.model.YI18nComboBox
+	 * @generated
+	 */
+	EClass getYI18nComboBox();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getDatadescription <em>Datadescription</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Datadescription</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getDatadescription()
+	 * @see #getYI18nComboBox()
+	 * @generated
+	 */
+	EReference getYI18nComboBox_Datadescription();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getDatatype <em>Datatype</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Datatype</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getDatatype()
+	 * @see #getYI18nComboBox()
+	 * @generated
+	 */
+	EReference getYI18nComboBox_Datatype();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getSelection <em>Selection</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Selection</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getSelection()
+	 * @see #getYI18nComboBox()
+	 * @generated
+	 */
+	EAttribute getYI18nComboBox_Selection();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getType <em>Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Type</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getType()
+	 * @see #getYI18nComboBox()
+	 * @generated
+	 */
+	EAttribute getYI18nComboBox_Type();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getEmfNsURI <em>Emf Ns URI</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Emf Ns URI</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getEmfNsURI()
+	 * @see #getYI18nComboBox()
+	 * @generated
+	 */
+	EAttribute getYI18nComboBox_EmfNsURI();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getTypeQualifiedName <em>Type Qualified Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Type Qualified Name</em>'.
+	 * @see org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getTypeQualifiedName()
+	 * @see #getYI18nComboBox()
+	 * @generated
+	 */
+	EAttribute getYI18nComboBox_TypeQualifiedName();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.extension.model.YIconComboBox <em>YIcon Combo Box</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -7156,6 +7566,64 @@ public interface YECviewPackage extends EPackage {
 		EAttribute YCUSTOM_DECIMAL_FIELD__VALUE = eINSTANCE.getYCustomDecimalField_Value();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl <em>YI1 8n Combo Box</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl
+		 * @see org.eclipse.osbp.ecview.extension.model.impl.YECviewPackageImpl#getYI18nComboBox()
+		 * @generated
+		 */
+		EClass YI1_8N_COMBO_BOX = eINSTANCE.getYI18nComboBox();
+
+		/**
+		 * The meta object literal for the '<em><b>Datadescription</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference YI1_8N_COMBO_BOX__DATADESCRIPTION = eINSTANCE.getYI18nComboBox_Datadescription();
+
+		/**
+		 * The meta object literal for the '<em><b>Datatype</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference YI1_8N_COMBO_BOX__DATATYPE = eINSTANCE.getYI18nComboBox_Datatype();
+
+		/**
+		 * The meta object literal for the '<em><b>Selection</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YI1_8N_COMBO_BOX__SELECTION = eINSTANCE.getYI18nComboBox_Selection();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YI1_8N_COMBO_BOX__TYPE = eINSTANCE.getYI18nComboBox_Type();
+
+		/**
+		 * The meta object literal for the '<em><b>Emf Ns URI</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YI1_8N_COMBO_BOX__EMF_NS_URI = eINSTANCE.getYI18nComboBox_EmfNsURI();
+
+		/**
+		 * The meta object literal for the '<em><b>Type Qualified Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME = eINSTANCE.getYI18nComboBox_TypeQualifiedName();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.extension.model.impl.YIconComboBoxImpl <em>YIcon Combo Box</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YI18nComboBox.java b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YI18nComboBox.java
new file mode 100644
index 0000000..ca7bcc3
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/YI18nComboBox.java
@@ -0,0 +1,203 @@
+/**
+ * All rights reserved by Loetz GmbH und CoKG Heidelberg 2015.
+ * 
+ * Contributors:
+ *       Florian Pirchner - initial API and implementation
+ */
+package org.eclipse.osbp.ecview.extension.model;
+
+import org.eclipse.osbp.ecview.core.common.model.core.YCollectionBindable;
+import org.eclipse.osbp.ecview.core.common.model.core.YSelectionBindable;
+
+import org.eclipse.osbp.ecview.core.common.model.datatypes.YDatadescription;
+
+import org.eclipse.osbp.ecview.core.extension.model.datatypes.YComboBoxDatatype;
+
+import org.eclipse.osbp.ecview.core.extension.model.extension.YInput;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>YI1 8n Combo Box</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getDatadescription <em>Datadescription</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getDatatype <em>Datatype</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getSelection <em>Selection</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getEmfNsURI <em>Emf Ns URI</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.osbp.ecview.extension.model.YECviewPackage#getYI18nComboBox()
+ * @model
+ * @generated
+ */
+public interface YI18nComboBox extends YInput, YCollectionBindable, YSelectionBindable {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String copyright = "All rights reserved by Loetz GmbH und CoKG Heidelberg 2015.\n\nContributors:\n      Florian Pirchner - initial API and implementation";
+
+	/**
+	 * Returns the value of the '<em><b>Datadescription</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Datadescription</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Datadescription</em>' reference.
+	 * @see #setDatadescription(YDatadescription)
+	 * @see org.eclipse.osbp.ecview.extension.model.YECviewPackage#getYI18nComboBox_Datadescription()
+	 * @model
+	 * @generated
+	 */
+	YDatadescription getDatadescription();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getDatadescription <em>Datadescription</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Datadescription</em>' reference.
+	 * @see #getDatadescription()
+	 * @generated
+	 */
+	void setDatadescription(YDatadescription value);
+
+	/**
+	 * Returns the value of the '<em><b>Datatype</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Datatype</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Datatype</em>' reference.
+	 * @see #setDatatype(YComboBoxDatatype)
+	 * @see org.eclipse.osbp.ecview.extension.model.YECviewPackage#getYI18nComboBox_Datatype()
+	 * @model
+	 * @generated
+	 */
+	YComboBoxDatatype getDatatype();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getDatatype <em>Datatype</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Datatype</em>' reference.
+	 * @see #getDatatype()
+	 * @generated
+	 */
+	void setDatatype(YComboBoxDatatype value);
+
+	/**
+	 * Returns the value of the '<em><b>Selection</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Selection</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Selection</em>' attribute.
+	 * @see #setSelection(Object)
+	 * @see org.eclipse.osbp.ecview.extension.model.YECviewPackage#getYI18nComboBox_Selection()
+	 * @model transient="true"
+	 * @generated
+	 */
+	Object getSelection();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getSelection <em>Selection</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Selection</em>' attribute.
+	 * @see #getSelection()
+	 * @generated
+	 */
+	void setSelection(Object value);
+
+	/**
+	 * Returns the value of the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Type</em>' attribute.
+	 * @see #setType(Class)
+	 * @see org.eclipse.osbp.ecview.extension.model.YECviewPackage#getYI18nComboBox_Type()
+	 * @model
+	 * @generated
+	 */
+	Class<?> getType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getType <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * @see #getType()
+	 * @generated
+	 */
+	void setType(Class<?> value);
+
+	/**
+	 * Returns the value of the '<em><b>Emf Ns URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Emf Ns URI</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Emf Ns URI</em>' attribute.
+	 * @see #setEmfNsURI(String)
+	 * @see org.eclipse.osbp.ecview.extension.model.YECviewPackage#getYI18nComboBox_EmfNsURI()
+	 * @model
+	 * @generated
+	 */
+	String getEmfNsURI();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getEmfNsURI <em>Emf Ns URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Emf Ns URI</em>' attribute.
+	 * @see #getEmfNsURI()
+	 * @generated
+	 */
+	void setEmfNsURI(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Type Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Type Qualified Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Type Qualified Name</em>' attribute.
+	 * @see #setTypeQualifiedName(String)
+	 * @see org.eclipse.osbp.ecview.extension.model.YECviewPackage#getYI18nComboBox_TypeQualifiedName()
+	 * @model
+	 * @generated
+	 */
+	String getTypeQualifiedName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox#getTypeQualifiedName <em>Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type Qualified Name</em>' attribute.
+	 * @see #getTypeQualifiedName()
+	 * @generated
+	 */
+	void setTypeQualifiedName(String value);
+
+} // YI18nComboBox
diff --git a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YECviewFactoryImpl.java b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YECviewFactoryImpl.java
index 7c7c123..8c4c428 100644
--- a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YECviewFactoryImpl.java
+++ b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YECviewFactoryImpl.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.osbp.ecview.extension.model.*;
 import org.eclipse.osbp.ecview.extension.model.YBlobUploadComponent;
 import org.eclipse.osbp.ecview.extension.model.YCollectionSuspect;
 import org.eclipse.osbp.ecview.extension.model.YColumnInfo;
@@ -118,6 +119,7 @@ public class YECviewFactoryImpl extends EFactoryImpl implements YECviewFactory {
 			case YECviewPackage.YSUSPECT_INFO: return createYSuspectInfo();
 			case YECviewPackage.YBLOB_UPLOAD_COMPONENT: return createYBlobUploadComponent();
 			case YECviewPackage.YCUSTOM_DECIMAL_FIELD: return createYCustomDecimalField();
+			case YECviewPackage.YI1_8N_COMBO_BOX: return createYI18nComboBox();
 			case YECviewPackage.YICON_COMBO_BOX: return createYIconComboBox();
 			case YECviewPackage.YQUANTITY_TEXT_FIELD: return createYQuantityTextField();
 			case YECviewPackage.YCOLLECTION_SUSPECT: return createYCollectionSuspect();
@@ -328,6 +330,16 @@ public class YECviewFactoryImpl extends EFactoryImpl implements YECviewFactory {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YI18nComboBox createYI18nComboBox() {
+		YI18nComboBoxImpl yi18nComboBox = new YI18nComboBoxImpl();
+		return yi18nComboBox;
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @return the y icon combo box
diff --git a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YECviewPackageImpl.java b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YECviewPackageImpl.java
index d8b5a0a..4020b8b 100644
--- a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YECviewPackageImpl.java
+++ b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YECviewPackageImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.osbp.ecview.extension.model.YDelegatingLayoutingStrategy;
 import org.eclipse.osbp.ecview.extension.model.YECviewFactory;
 import org.eclipse.osbp.ecview.extension.model.YECviewPackage;
 import org.eclipse.osbp.ecview.extension.model.YFocusingStrategy;
+import org.eclipse.osbp.ecview.extension.model.YI18nComboBox;
 import org.eclipse.osbp.ecview.extension.model.YIconComboBox;
 import org.eclipse.osbp.ecview.extension.model.YLayoutingInfo;
 import org.eclipse.osbp.ecview.extension.model.YLayoutingStrategy;
@@ -182,6 +183,13 @@ public class YECviewPackageImpl extends EPackageImpl implements YECviewPackage {
 	private EClass yCustomDecimalFieldEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass yi18nComboBoxEClass = null;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @generated
@@ -888,6 +896,69 @@ public class YECviewPackageImpl extends EPackageImpl implements YECviewPackage {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getYI18nComboBox() {
+		return yi18nComboBoxEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getYI18nComboBox_Datadescription() {
+		return (EReference)yi18nComboBoxEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getYI18nComboBox_Datatype() {
+		return (EReference)yi18nComboBoxEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYI18nComboBox_Selection() {
+		return (EAttribute)yi18nComboBoxEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYI18nComboBox_Type() {
+		return (EAttribute)yi18nComboBoxEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYI18nComboBox_EmfNsURI() {
+		return (EAttribute)yi18nComboBoxEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYI18nComboBox_TypeQualifiedName() {
+		return (EAttribute)yi18nComboBoxEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @return the y icon combo box
@@ -1548,6 +1619,14 @@ public class YECviewPackageImpl extends EPackageImpl implements YECviewPackage {
 		createEReference(yCustomDecimalFieldEClass, YCUSTOM_DECIMAL_FIELD__DATADESCRIPTION);
 		createEAttribute(yCustomDecimalFieldEClass, YCUSTOM_DECIMAL_FIELD__VALUE);
 
+		yi18nComboBoxEClass = createEClass(YI1_8N_COMBO_BOX);
+		createEReference(yi18nComboBoxEClass, YI1_8N_COMBO_BOX__DATADESCRIPTION);
+		createEReference(yi18nComboBoxEClass, YI1_8N_COMBO_BOX__DATATYPE);
+		createEAttribute(yi18nComboBoxEClass, YI1_8N_COMBO_BOX__SELECTION);
+		createEAttribute(yi18nComboBoxEClass, YI1_8N_COMBO_BOX__TYPE);
+		createEAttribute(yi18nComboBoxEClass, YI1_8N_COMBO_BOX__EMF_NS_URI);
+		createEAttribute(yi18nComboBoxEClass, YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME);
+
 		yIconComboBoxEClass = createEClass(YICON_COMBO_BOX);
 		createEReference(yIconComboBoxEClass, YICON_COMBO_BOX__DATADESCRIPTION);
 		createEReference(yIconComboBoxEClass, YICON_COMBO_BOX__DATATYPE);
@@ -1682,6 +1761,9 @@ public class YECviewPackageImpl extends EPackageImpl implements YECviewPackage {
 		yBlobUploadComponentEClass.getESuperTypes().add(theCoreModelPackage.getYValueBindable());
 		yCustomDecimalFieldEClass.getESuperTypes().add(theExtensionModelPackage.getYInput());
 		yCustomDecimalFieldEClass.getESuperTypes().add(theCoreModelPackage.getYValueBindable());
+		yi18nComboBoxEClass.getESuperTypes().add(theExtensionModelPackage.getYInput());
+		yi18nComboBoxEClass.getESuperTypes().add(theCoreModelPackage.getYCollectionBindable());
+		yi18nComboBoxEClass.getESuperTypes().add(theCoreModelPackage.getYSelectionBindable());
 		yIconComboBoxEClass.getESuperTypes().add(theExtensionModelPackage.getYInput());
 		yIconComboBoxEClass.getESuperTypes().add(theCoreModelPackage.getYCollectionBindable());
 		yIconComboBoxEClass.getESuperTypes().add(theCoreModelPackage.getYSelectionBindable());
@@ -1785,6 +1867,17 @@ public class YECviewPackageImpl extends EPackageImpl implements YECviewPackage {
 		initEReference(getYCustomDecimalField_Datadescription(), theDatatypesPackage.getYDatadescription(), null, "datadescription", null, 0, 1, YCustomDecimalField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getYCustomDecimalField_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, YCustomDecimalField.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(yi18nComboBoxEClass, YI18nComboBox.class, "YI18nComboBox", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getYI18nComboBox_Datadescription(), theDatatypesPackage.getYDatadescription(), null, "datadescription", null, 0, 1, YI18nComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getYI18nComboBox_Datatype(), theExtDatatypesPackage.getYComboBoxDatatype(), null, "datatype", null, 0, 1, YI18nComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYI18nComboBox_Selection(), ecorePackage.getEJavaObject(), "selection", null, 0, 1, YI18nComboBox.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		g1 = createEGenericType(ecorePackage.getEJavaClass());
+		g2 = createEGenericType();
+		g1.getETypeArguments().add(g2);
+		initEAttribute(getYI18nComboBox_Type(), g1, "type", null, 0, 1, YI18nComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYI18nComboBox_EmfNsURI(), ecorePackage.getEString(), "emfNsURI", null, 0, 1, YI18nComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYI18nComboBox_TypeQualifiedName(), ecorePackage.getEString(), "typeQualifiedName", null, 0, 1, YI18nComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(yIconComboBoxEClass, YIconComboBox.class, "YIconComboBox", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getYIconComboBox_Datadescription(), theDatatypesPackage.getYDatadescription(), null, "datadescription", null, 0, 1, YIconComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getYIconComboBox_Datatype(), theExtDatatypesPackage.getYComboBoxDatatype(), null, "datatype", null, 0, 1, YIconComboBox.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YI18nComboBoxImpl.java b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YI18nComboBoxImpl.java
new file mode 100644
index 0000000..7d95f6d
--- /dev/null
+++ b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/impl/YI18nComboBoxImpl.java
@@ -0,0 +1,821 @@
+/**
+ * All rights reserved by Loetz GmbH und CoKG Heidelberg 2015.
+ * 
+ * Contributors:
+ *       Florian Pirchner - initial API and implementation
+ */
+package org.eclipse.osbp.ecview.extension.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.osbp.ecview.core.common.model.core.CoreModelFactory;
+import org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage;
+import org.eclipse.osbp.ecview.core.common.model.core.YBindable;
+import org.eclipse.osbp.ecview.core.common.model.core.YCollectionBindable;
+import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableCollectionEndpoint;
+import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableSelectionEndpoint;
+import org.eclipse.osbp.ecview.core.common.model.core.YSelectionBindable;
+
+import org.eclipse.osbp.ecview.core.common.model.datatypes.YDatadescription;
+
+import org.eclipse.osbp.ecview.core.extension.model.datatypes.YComboBoxDatatype;
+
+import org.eclipse.osbp.ecview.core.extension.model.extension.impl.YInputImpl;
+
+import org.eclipse.osbp.ecview.extension.model.YECviewPackage;
+import org.eclipse.osbp.ecview.extension.model.YI18nComboBox;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>YI1 8n Combo Box</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl#getCollectionBindingEndpoint <em>Collection Binding Endpoint</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl#getSelectionBindingEndpoint <em>Selection Binding Endpoint</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl#getDatadescription <em>Datadescription</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl#getDatatype <em>Datatype</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl#getSelection <em>Selection</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl#getEmfNsURI <em>Emf Ns URI</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.extension.model.impl.YI18nComboBoxImpl#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class YI18nComboBoxImpl extends YInputImpl implements YI18nComboBox {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String copyright = "All rights reserved by Loetz GmbH und CoKG Heidelberg 2015.\n\nContributors:\n      Florian Pirchner - initial API and implementation";
+
+	/**
+	 * The cached value of the '{@link #getCollectionBindingEndpoint() <em>Collection Binding Endpoint</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCollectionBindingEndpoint()
+	 * @generated
+	 * @ordered
+	 */
+	protected YEmbeddableCollectionEndpoint collectionBindingEndpoint;
+
+	/**
+	 * The cached value of the '{@link #getSelectionBindingEndpoint() <em>Selection Binding Endpoint</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSelectionBindingEndpoint()
+	 * @generated
+	 * @ordered
+	 */
+	protected YEmbeddableSelectionEndpoint selectionBindingEndpoint;
+
+	/**
+	 * The cached value of the '{@link #getDatadescription() <em>Datadescription</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDatadescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected YDatadescription datadescription;
+
+	/**
+	 * The cached value of the '{@link #getDatatype() <em>Datatype</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDatatype()
+	 * @generated
+	 * @ordered
+	 */
+	protected YComboBoxDatatype datatype;
+
+	/**
+	 * The default value of the '{@link #getSelection() <em>Selection</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSelection()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Object SELECTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSelection() <em>Selection</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSelection()
+	 * @generated
+	 * @ordered
+	 */
+	protected Object selection = SELECTION_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected Class<?> type;
+
+	/**
+	 * The default value of the '{@link #getEmfNsURI() <em>Emf Ns URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmfNsURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EMF_NS_URI_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEmfNsURI() <em>Emf Ns URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmfNsURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected String emfNsURI = EMF_NS_URI_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTypeQualifiedName() <em>Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTypeQualifiedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TYPE_QUALIFIED_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTypeQualifiedName() <em>Type Qualified Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTypeQualifiedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String typeQualifiedName = TYPE_QUALIFIED_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YI18nComboBoxImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return YECviewPackage.Literals.YI1_8N_COMBO_BOX;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YEmbeddableCollectionEndpoint getCollectionBindingEndpoint() {
+		if (collectionBindingEndpoint != null && collectionBindingEndpoint.eIsProxy()) {
+			InternalEObject oldCollectionBindingEndpoint = (InternalEObject)collectionBindingEndpoint;
+			collectionBindingEndpoint = (YEmbeddableCollectionEndpoint)eResolveProxy(oldCollectionBindingEndpoint);
+			if (collectionBindingEndpoint != oldCollectionBindingEndpoint) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT, oldCollectionBindingEndpoint, collectionBindingEndpoint));
+			}
+		}
+		return collectionBindingEndpoint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YEmbeddableCollectionEndpoint basicGetCollectionBindingEndpoint() {
+		return collectionBindingEndpoint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCollectionBindingEndpoint(YEmbeddableCollectionEndpoint newCollectionBindingEndpoint, NotificationChain msgs) {
+		YEmbeddableCollectionEndpoint oldCollectionBindingEndpoint = collectionBindingEndpoint;
+		collectionBindingEndpoint = newCollectionBindingEndpoint;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT, oldCollectionBindingEndpoint, newCollectionBindingEndpoint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCollectionBindingEndpoint(YEmbeddableCollectionEndpoint newCollectionBindingEndpoint) {
+		if (newCollectionBindingEndpoint != collectionBindingEndpoint) {
+			NotificationChain msgs = null;
+			if (collectionBindingEndpoint != null)
+				msgs = ((InternalEObject)collectionBindingEndpoint).eInverseRemove(this, CoreModelPackage.YEMBEDDABLE_COLLECTION_ENDPOINT__ELEMENT, YEmbeddableCollectionEndpoint.class, msgs);
+			if (newCollectionBindingEndpoint != null)
+				msgs = ((InternalEObject)newCollectionBindingEndpoint).eInverseAdd(this, CoreModelPackage.YEMBEDDABLE_COLLECTION_ENDPOINT__ELEMENT, YEmbeddableCollectionEndpoint.class, msgs);
+			msgs = basicSetCollectionBindingEndpoint(newCollectionBindingEndpoint, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT, newCollectionBindingEndpoint, newCollectionBindingEndpoint));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YEmbeddableSelectionEndpoint getSelectionBindingEndpoint() {
+		if (selectionBindingEndpoint != null && selectionBindingEndpoint.eIsProxy()) {
+			InternalEObject oldSelectionBindingEndpoint = (InternalEObject)selectionBindingEndpoint;
+			selectionBindingEndpoint = (YEmbeddableSelectionEndpoint)eResolveProxy(oldSelectionBindingEndpoint);
+			if (selectionBindingEndpoint != oldSelectionBindingEndpoint) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT, oldSelectionBindingEndpoint, selectionBindingEndpoint));
+			}
+		}
+		return selectionBindingEndpoint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YEmbeddableSelectionEndpoint basicGetSelectionBindingEndpoint() {
+		return selectionBindingEndpoint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetSelectionBindingEndpoint(YEmbeddableSelectionEndpoint newSelectionBindingEndpoint, NotificationChain msgs) {
+		YEmbeddableSelectionEndpoint oldSelectionBindingEndpoint = selectionBindingEndpoint;
+		selectionBindingEndpoint = newSelectionBindingEndpoint;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT, oldSelectionBindingEndpoint, newSelectionBindingEndpoint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionBindingEndpoint(YEmbeddableSelectionEndpoint newSelectionBindingEndpoint) {
+		if (newSelectionBindingEndpoint != selectionBindingEndpoint) {
+			NotificationChain msgs = null;
+			if (selectionBindingEndpoint != null)
+				msgs = ((InternalEObject)selectionBindingEndpoint).eInverseRemove(this, CoreModelPackage.YEMBEDDABLE_SELECTION_ENDPOINT__ELEMENT, YEmbeddableSelectionEndpoint.class, msgs);
+			if (newSelectionBindingEndpoint != null)
+				msgs = ((InternalEObject)newSelectionBindingEndpoint).eInverseAdd(this, CoreModelPackage.YEMBEDDABLE_SELECTION_ENDPOINT__ELEMENT, YEmbeddableSelectionEndpoint.class, msgs);
+			msgs = basicSetSelectionBindingEndpoint(newSelectionBindingEndpoint, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT, newSelectionBindingEndpoint, newSelectionBindingEndpoint));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YDatadescription getDatadescription() {
+		if (datadescription != null && datadescription.eIsProxy()) {
+			InternalEObject oldDatadescription = (InternalEObject)datadescription;
+			datadescription = (YDatadescription)eResolveProxy(oldDatadescription);
+			if (datadescription != oldDatadescription) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, YECviewPackage.YI1_8N_COMBO_BOX__DATADESCRIPTION, oldDatadescription, datadescription));
+			}
+		}
+		return datadescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YDatadescription basicGetDatadescription() {
+		return datadescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDatadescription(YDatadescription newDatadescription) {
+		YDatadescription oldDatadescription = datadescription;
+		datadescription = newDatadescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__DATADESCRIPTION, oldDatadescription, datadescription));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YComboBoxDatatype getDatatype() {
+		if (datatype != null && datatype.eIsProxy()) {
+			InternalEObject oldDatatype = (InternalEObject)datatype;
+			datatype = (YComboBoxDatatype)eResolveProxy(oldDatatype);
+			if (datatype != oldDatatype) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, YECviewPackage.YI1_8N_COMBO_BOX__DATATYPE, oldDatatype, datatype));
+			}
+		}
+		return datatype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YComboBoxDatatype basicGetDatatype() {
+		return datatype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDatatype(YComboBoxDatatype newDatatype) {
+		YComboBoxDatatype oldDatatype = datatype;
+		datatype = newDatatype;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__DATATYPE, oldDatatype, datatype));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getSelection() {
+		return selection;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelection(Object newSelection) {
+		Object oldSelection = selection;
+		selection = newSelection;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__SELECTION, oldSelection, selection));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Class<?> getType() {
+		return type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setType(Class<?> newType) {
+		Class<?> oldType = type;
+		type = newType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__TYPE, oldType, type));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getEmfNsURI() {
+		return emfNsURI;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEmfNsURI(String newEmfNsURI) {
+		String oldEmfNsURI = emfNsURI;
+		emfNsURI = newEmfNsURI;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__EMF_NS_URI, oldEmfNsURI, emfNsURI));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTypeQualifiedName() {
+		return typeQualifiedName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTypeQualifiedName(String newTypeQualifiedName) {
+		String oldTypeQualifiedName = typeQualifiedName;
+		typeQualifiedName = newTypeQualifiedName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, YECviewPackage.YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME, oldTypeQualifiedName, typeQualifiedName));
+	}
+
+	/**
+	 * Creates a new instance of selection endpoint with a reference to that
+	 * embeddable.
+	 *
+	 * @return the y embeddable selection endpoint
+	 * @generated NOT
+	 */
+	public YEmbeddableSelectionEndpoint createSelectionEndpoint() {
+		YEmbeddableSelectionEndpoint ep = CoreModelFactory.eINSTANCE
+				.createYEmbeddableSelectionEndpoint();
+		ep.setElement(this);
+		return ep;
+	}
+
+	/**
+	 * Creates a new instance of collection endpoint with a reference to that
+	 * embeddable.
+	 *
+	 * @return the y embeddable collection endpoint
+	 * @generated NOT
+	 */
+	public YEmbeddableCollectionEndpoint createCollectionEndpoint() {
+		YEmbeddableCollectionEndpoint ep = CoreModelFactory.eINSTANCE
+				.createYEmbeddableCollectionEndpoint();
+		ep.setElement(this);
+		return ep;
+
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YEmbeddableSelectionEndpoint createSelectionEndpointGen() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YEmbeddableCollectionEndpoint createCollectionEndpointGen() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT:
+				if (collectionBindingEndpoint != null)
+					msgs = ((InternalEObject)collectionBindingEndpoint).eInverseRemove(this, CoreModelPackage.YEMBEDDABLE_COLLECTION_ENDPOINT__ELEMENT, YEmbeddableCollectionEndpoint.class, msgs);
+				return basicSetCollectionBindingEndpoint((YEmbeddableCollectionEndpoint)otherEnd, msgs);
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT:
+				if (selectionBindingEndpoint != null)
+					msgs = ((InternalEObject)selectionBindingEndpoint).eInverseRemove(this, CoreModelPackage.YEMBEDDABLE_SELECTION_ENDPOINT__ELEMENT, YEmbeddableSelectionEndpoint.class, msgs);
+				return basicSetSelectionBindingEndpoint((YEmbeddableSelectionEndpoint)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT:
+				return basicSetCollectionBindingEndpoint(null, msgs);
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT:
+				return basicSetSelectionBindingEndpoint(null, 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 YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT:
+				if (resolve) return getCollectionBindingEndpoint();
+				return basicGetCollectionBindingEndpoint();
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT:
+				if (resolve) return getSelectionBindingEndpoint();
+				return basicGetSelectionBindingEndpoint();
+			case YECviewPackage.YI1_8N_COMBO_BOX__DATADESCRIPTION:
+				if (resolve) return getDatadescription();
+				return basicGetDatadescription();
+			case YECviewPackage.YI1_8N_COMBO_BOX__DATATYPE:
+				if (resolve) return getDatatype();
+				return basicGetDatatype();
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION:
+				return getSelection();
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE:
+				return getType();
+			case YECviewPackage.YI1_8N_COMBO_BOX__EMF_NS_URI:
+				return getEmfNsURI();
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME:
+				return getTypeQualifiedName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT:
+				setCollectionBindingEndpoint((YEmbeddableCollectionEndpoint)newValue);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT:
+				setSelectionBindingEndpoint((YEmbeddableSelectionEndpoint)newValue);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__DATADESCRIPTION:
+				setDatadescription((YDatadescription)newValue);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__DATATYPE:
+				setDatatype((YComboBoxDatatype)newValue);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION:
+				setSelection(newValue);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE:
+				setType((Class<?>)newValue);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__EMF_NS_URI:
+				setEmfNsURI((String)newValue);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME:
+				setTypeQualifiedName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT:
+				setCollectionBindingEndpoint((YEmbeddableCollectionEndpoint)null);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT:
+				setSelectionBindingEndpoint((YEmbeddableSelectionEndpoint)null);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__DATADESCRIPTION:
+				setDatadescription((YDatadescription)null);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__DATATYPE:
+				setDatatype((YComboBoxDatatype)null);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION:
+				setSelection(SELECTION_EDEFAULT);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE:
+				setType((Class<?>)null);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__EMF_NS_URI:
+				setEmfNsURI(EMF_NS_URI_EDEFAULT);
+				return;
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME:
+				setTypeQualifiedName(TYPE_QUALIFIED_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT:
+				return collectionBindingEndpoint != null;
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT:
+				return selectionBindingEndpoint != null;
+			case YECviewPackage.YI1_8N_COMBO_BOX__DATADESCRIPTION:
+				return datadescription != null;
+			case YECviewPackage.YI1_8N_COMBO_BOX__DATATYPE:
+				return datatype != null;
+			case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION:
+				return SELECTION_EDEFAULT == null ? selection != null : !SELECTION_EDEFAULT.equals(selection);
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE:
+				return type != null;
+			case YECviewPackage.YI1_8N_COMBO_BOX__EMF_NS_URI:
+				return EMF_NS_URI_EDEFAULT == null ? emfNsURI != null : !EMF_NS_URI_EDEFAULT.equals(emfNsURI);
+			case YECviewPackage.YI1_8N_COMBO_BOX__TYPE_QUALIFIED_NAME:
+				return TYPE_QUALIFIED_NAME_EDEFAULT == null ? typeQualifiedName != null : !TYPE_QUALIFIED_NAME_EDEFAULT.equals(typeQualifiedName);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == YBindable.class) {
+			switch (derivedFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == YCollectionBindable.class) {
+			switch (derivedFeatureID) {
+				case YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT: return CoreModelPackage.YCOLLECTION_BINDABLE__COLLECTION_BINDING_ENDPOINT;
+				default: return -1;
+			}
+		}
+		if (baseClass == YSelectionBindable.class) {
+			switch (derivedFeatureID) {
+				case YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT: return CoreModelPackage.YSELECTION_BINDABLE__SELECTION_BINDING_ENDPOINT;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == YBindable.class) {
+			switch (baseFeatureID) {
+				default: return -1;
+			}
+		}
+		if (baseClass == YCollectionBindable.class) {
+			switch (baseFeatureID) {
+				case CoreModelPackage.YCOLLECTION_BINDABLE__COLLECTION_BINDING_ENDPOINT: return YECviewPackage.YI1_8N_COMBO_BOX__COLLECTION_BINDING_ENDPOINT;
+				default: return -1;
+			}
+		}
+		if (baseClass == YSelectionBindable.class) {
+			switch (baseFeatureID) {
+				case CoreModelPackage.YSELECTION_BINDABLE__SELECTION_BINDING_ENDPOINT: return YECviewPackage.YI1_8N_COMBO_BOX__SELECTION_BINDING_ENDPOINT;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (selection: ");
+		result.append(selection);
+		result.append(", type: ");
+		result.append(type);
+		result.append(", emfNsURI: ");
+		result.append(emfNsURI);
+		result.append(", typeQualifiedName: ");
+		result.append(typeQualifiedName);
+		result.append(')');
+		return result.toString();
+	}
+
+	/**
+	 * Sets the label by creating a new datadescription.
+	 *
+	 * @param label
+	 *            the new label
+	 */
+	public void setLabel(String label) {
+		YDatadescription ds = getDatadescription();
+		if (ds == null) {
+			setDatadescription(createDatadescription(label));
+			getOrphanDatadescriptions().add(getDatadescription());
+		} else {
+			ds.setLabel(label);
+		}
+	}
+
+	/**
+	 * Sets the label i18nKey by creating a new datadescription.
+	 *
+	 * @param i18nKey
+	 *            the new label i18n key
+	 */
+	public void setLabelI18nKey(String i18nKey) {
+		YDatadescription ds = getDatadescription();
+		if (ds == null) {
+			setDatadescription(createDatadescriptionForI18n(i18nKey));
+			getOrphanDatadescriptions().add(getDatadescription());
+		} else {
+			ds.setLabelI18nKey(i18nKey);
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#getLabel()
+	 */
+	@Override
+	public String getLabel() {
+		YDatadescription ds = getDatadescription();
+		if (ds != null) {
+			return ds.getLabel();
+		}
+		return "";
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#getLabelI18nKey()
+	 */
+	@Override
+	public String getLabelI18nKey() {
+		YDatadescription ds = getDatadescription();
+		if (ds != null) {
+			return ds.getLabelI18nKey();
+		}
+		return "";
+	}
+
+} //YI18nComboBoxImpl
diff --git a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/util/YECviewAdapterFactory.java b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/util/YECviewAdapterFactory.java
index 0457766..4f6159c 100644
--- a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/util/YECviewAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/util/YECviewAdapterFactory.java
@@ -36,6 +36,7 @@ import org.eclipse.osbp.ecview.core.common.model.core.YValueBindable;
 import org.eclipse.osbp.ecview.core.common.model.core.YVisibleable;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YBeanServiceConsumer;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YInput;
+import org.eclipse.osbp.ecview.extension.model.*;
 import org.eclipse.osbp.ecview.extension.model.YBlobUploadComponent;
 import org.eclipse.osbp.ecview.extension.model.YCollectionSuspect;
 import org.eclipse.osbp.ecview.extension.model.YColumnInfo;
@@ -189,6 +190,10 @@ public class YECviewAdapterFactory extends AdapterFactoryImpl {
 				return createYCustomDecimalFieldAdapter();
 			}
 			@Override
+			public Adapter caseYI18nComboBox(YI18nComboBox object) {
+				return createYI18nComboBoxAdapter();
+			}
+			@Override
 			public Adapter caseYIconComboBox(YIconComboBox object) {
 				return createYIconComboBoxAdapter();
 			}
@@ -539,6 +544,20 @@ public class YECviewAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.extension.model.YI18nComboBox <em>YI1 8n Combo Box</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 org.eclipse.osbp.ecview.extension.model.YI18nComboBox
+	 * @generated
+	 */
+	public Adapter createYI18nComboBoxAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.extension.model.YIconComboBox <em>YIcon Combo Box</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/util/YECviewSwitch.java b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/util/YECviewSwitch.java
index 168faff..9303612 100644
--- a/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/util/YECviewSwitch.java
+++ b/org.eclipse.osbp.ecview.extension.model/src/org/eclipse/osbp/ecview/extension/model/util/YECviewSwitch.java
@@ -35,6 +35,7 @@ import org.eclipse.osbp.ecview.core.common.model.core.YValueBindable;
 import org.eclipse.osbp.ecview.core.common.model.core.YVisibleable;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YBeanServiceConsumer;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YInput;
+import org.eclipse.osbp.ecview.extension.model.*;
 import org.eclipse.osbp.ecview.extension.model.YBlobUploadComponent;
 import org.eclipse.osbp.ecview.extension.model.YCollectionSuspect;
 import org.eclipse.osbp.ecview.extension.model.YColumnInfo;
@@ -289,6 +290,26 @@ public class YECviewSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case YECviewPackage.YI1_8N_COMBO_BOX: {
+				YI18nComboBox yi18nComboBox = (YI18nComboBox)theEObject;
+				T result = caseYI18nComboBox(yi18nComboBox);
+				if (result == null) result = caseYInput(yi18nComboBox);
+				if (result == null) result = caseYCollectionBindable(yi18nComboBox);
+				if (result == null) result = caseYSelectionBindable(yi18nComboBox);
+				if (result == null) result = caseYField(yi18nComboBox);
+				if (result == null) result = caseYBindable(yi18nComboBox);
+				if (result == null) result = caseYEmbeddable(yi18nComboBox);
+				if (result == null) result = caseYEditable(yi18nComboBox);
+				if (result == null) result = caseYEnable(yi18nComboBox);
+				if (result == null) result = caseYFocusable(yi18nComboBox);
+				if (result == null) result = caseYElement(yi18nComboBox);
+				if (result == null) result = caseYCssAble(yi18nComboBox);
+				if (result == null) result = caseYVisibleable(yi18nComboBox);
+				if (result == null) result = caseYAuthorizationable(yi18nComboBox);
+				if (result == null) result = caseYTaggable(yi18nComboBox);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case YECviewPackage.YICON_COMBO_BOX: {
 				YIconComboBox yIconComboBox = (YIconComboBox)theEObject;
 				T result = caseYIconComboBox(yIconComboBox);
@@ -709,6 +730,21 @@ public class YECviewSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>YI1 8n Combo Box</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>YI1 8n Combo Box</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseYI18nComboBox(YI18nComboBox object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>YIcon Combo Box</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/pom.xml b/pom.xml
index 8c32fbf..ada2b5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
     </distributionManagement>
 
     <properties>
+        
 		<osbp.gitrepo.name>${project.groupId}</osbp.gitrepo.name>
     </properties>