catch up with development
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index f735bee..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation
-   distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-    i) changes to the Program, and
-   ii) additions to the Program;
-
-   where such changes and/or additions to the Program originate from and are
-   distributed by that particular Contributor. A Contribution 'originates'
-   from a Contributor if it was added to the Program by such Contributor
-   itself or anyone acting on such Contributor's behalf. Contributions do not
-   include additions to the Program which: (i) are separate modules of
-   software distributed in conjunction with the Program under their own
-   license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-  a) Subject to the terms of this Agreement, each Contributor hereby grants
-     Recipient a non-exclusive, worldwide, royalty-free copyright license to
-     reproduce, prepare derivative works of, publicly display, publicly
-     perform, distribute and sublicense the Contribution of such Contributor,
-     if any, and such derivative works, in source code and object code form.
-  b) Subject to the terms of this Agreement, each Contributor hereby grants
-     Recipient a non-exclusive, worldwide, royalty-free patent license under
-     Licensed Patents to make, use, sell, offer to sell, import and otherwise
-     transfer the Contribution of such Contributor, if any, in source code and
-     object code form. This patent license shall apply to the combination of
-     the Contribution and the Program if, at the time the Contribution is
-     added by the Contributor, such addition of the Contribution causes such
-     combination to be covered by the Licensed Patents. The patent license
-     shall not apply to any other combinations which include the Contribution.
-     No hardware per se is licensed hereunder.
-  c) Recipient understands that although each Contributor grants the licenses
-     to its Contributions set forth herein, no assurances are provided by any
-     Contributor that the Program does not infringe the patent or other
-     intellectual property rights of any other entity. Each Contributor
-     disclaims any liability to Recipient for claims brought by any other
-     entity based on infringement of intellectual property rights or
-     otherwise. As a condition to exercising the rights and licenses granted
-     hereunder, each Recipient hereby assumes sole responsibility to secure
-     any other intellectual property rights needed, if any. For example, if a
-     third party patent license is required to allow Recipient to distribute
-     the Program, it is Recipient's responsibility to acquire that license
-     before distributing the Program.
-  d) Each Contributor represents that to its knowledge it has sufficient
-     copyright rights in its Contribution, if any, to grant the copyright
-     license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
-  a) it complies with the terms and conditions of this Agreement; and
-  b) its license agreement:
-      i) effectively disclaims on behalf of all Contributors all warranties
-         and conditions, express and implied, including warranties or
-         conditions of title and non-infringement, and implied warranties or
-         conditions of merchantability and fitness for a particular purpose;
-     ii) effectively excludes on behalf of all Contributors all liability for
-         damages, including direct, indirect, special, incidental and
-         consequential damages, such as lost profits;
-    iii) states that any provisions which differ from this Agreement are
-         offered by that Contributor alone and not by any other party; and
-     iv) states that source code for the Program is available from such
-         Contributor, and informs licensees how to obtain it in a reasonable
-         manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-  a) it must be made available under this Agreement; and
-  b) a copy of this Agreement must be included with each copy of the Program.
-     Contributors may not remove or alter any copyright notices contained
-     within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution,
-if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore,
-if a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses,
-damages and costs (collectively "Losses") arising from claims, lawsuits and
-other legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such Commercial
-Contributor in connection with its distribution of the Program in a commercial
-product offering. The obligations in this section do not apply to any claims
-or Losses relating to any actual or alleged intellectual property
-infringement. In order to qualify, an Indemnified Contributor must:
-a) promptly notify the Commercial Contributor in writing of such claim, and
-b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such claim at
-its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If
-that Commercial Contributor then makes performance claims, or offers
-warranties related to Product X, those performance claims and warranties are
-such Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using
-and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the
-risks and costs of program errors, compliance with applicable laws, damage to
-or loss of data, programs or equipment, and unavailability or interruption of
-operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of the
-remainder of the terms of this Agreement, and without further action by the
-parties hereto, such provision shall be reformed to the minimum extent
-necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-(excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted
-under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue
-and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to
-time. No one other than the Agreement Steward has the right to modify this
-Agreement. The Eclipse Foundation is the initial Agreement Steward. The
-Eclipse Foundation may assign the responsibility to serve as the Agreement
-Steward to a suitable separate entity. Each new version of the Agreement will
-be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly
-stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
-licenses to the intellectual property of any Contributor under this Agreement,
-whether expressly, by implication, estoppel or otherwise. All rights in the
-Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
diff --git a/README.md b/README.md
deleted file mode 100644
index 09f3c8e..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-lunifera-ecview
-===============
diff --git a/org.eclipse.osbp.ecview.core.common.editparts.emf/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.common.editparts.emf/META-INF/MANIFEST.MF
index 3bb604c..cc3c7cf 100644
--- a/org.eclipse.osbp.ecview.core.common.editparts.emf/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.common.editparts.emf/META-INF/MANIFEST.MF
@@ -8,23 +8,21 @@
 Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  org.eclipse.osbp.ecview.core.common;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:=reexport,
- org.eclipse.core.databinding.observable;bundle-version="[1.4.1,1.5.0)",
- org.eclipse.core.databinding;bundle-version="[1.4.1,1.5.0)",
- org.eclipse.core.databinding.beans;bundle-version="[1.2.200,1.5.0)",
- org.eclipse.core.databinding.property;bundle-version="[1.4.200,1.5.0)",
+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding.beans;bundle-version="[1.3.100,1.4.0)",
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,1.7.0)",
  org.apache.commons.lang;bundle-version="2.6.0",
  org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.ecview.core.databinding.emf;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)",
  org.apache.commons.beanutils;bundle-version="1.9.2",
+ javax.validation.api;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.osbp.runtime.jsr303.validation;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: javax.validation;version="1.1.0",
- javax.validation.bootstrap;version="1.1.0",
- javax.validation.metadata;version="1.1.0",
- org.eclipse.emf.databinding,
+Import-Package: org.eclipse.emf.databinding,
  org.osgi.service.event;version="1.3.0",
  org.slf4j;version="1.6.4"
 Export-Package: org.eclipse.osbp.ecview.core.common.editpart.emf;version="0.9.0",
diff --git a/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/EditpartManager.java b/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/EditpartManager.java
index 55064f1..7803e46 100644
--- a/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/EditpartManager.java
+++ b/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/EditpartManager.java
@@ -25,6 +25,8 @@
 import org.eclipse.osbp.ecview.core.common.editpart.emf.validation.MaxLengthValidatorEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.validation.MinLengthValidatorEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.validation.RegexpValidatorEditpart;
+import org.eclipse.osbp.ecview.core.common.editpart.emf.validation.UniqueAttributeValidatorEditpart;
+import org.eclipse.osbp.ecview.core.common.editpart.emf.validation.validator.UniqueAttributeValidator;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.visibility.VisibilityProcessorEditpart;
 import org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage;
 import org.eclipse.osbp.ecview.core.common.model.binding.YBeanValueBindingEndpoint;
@@ -62,6 +64,7 @@
 import org.eclipse.osbp.ecview.core.common.model.validation.YMaxLengthValidator;
 import org.eclipse.osbp.ecview.core.common.model.validation.YMinLengthValidator;
 import org.eclipse.osbp.ecview.core.common.model.validation.YRegexpValidator;
+import org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidator;
 import org.eclipse.osbp.ecview.core.common.model.visibility.VisibilityPackage;
 import org.eclipse.osbp.ecview.core.common.model.visibility.YVisibilityProcessor;
 
@@ -281,6 +284,8 @@
 			result = createNewInstance(KeyStrokeDefinitionEditpart.class);
 		} else if (yElement instanceof YConverter) {
 			result = createNewInstance(ConverterEditpart.class);
+		} else if (yElement instanceof YUniqueAttributeValidator) {
+			result = createNewInstance(UniqueAttributeValidatorEditpart.class);
 		}
 
 		if (result != null) {
diff --git a/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/validation/BeanValidationValidatorEditpart.java b/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/validation/BeanValidationValidatorEditpart.java
index 79ee072..739bb3b 100644
--- a/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/validation/BeanValidationValidatorEditpart.java
+++ b/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/validation/BeanValidationValidatorEditpart.java
@@ -11,18 +11,21 @@
 package org.eclipse.osbp.ecview.core.common.editpart.emf.validation;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.validation.ValidatorFactory;
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService;
+import org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService.LocaleListener;
 import org.eclipse.osbp.ecview.core.common.context.IViewContext;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.validation.validator.BeanValidationValidator;
 import org.eclipse.osbp.ecview.core.common.editpart.validation.IBeanValidationValidatorEditpart;
 import org.eclipse.osbp.ecview.core.common.model.core.YField;
 import org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage;
 import org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidator;
-import org.eclipse.osbp.ecview.core.common.model.validation.YMaxLengthValidationConfig;
+import org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidatorConfig;
 import org.eclipse.osbp.ecview.core.common.validation.IValidationConfig;
 import org.eclipse.osbp.ecview.core.common.validation.IValidator;
 import org.eclipse.osbp.runtime.common.i18n.II18nService;
@@ -30,18 +33,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BeanValidationValidatorEditpart extends
-		ValidatorEditpart<YBeanValidationValidator> implements
-		IBeanValidationValidatorEditpart {
+public class BeanValidationValidatorEditpart extends ValidatorEditpart<YBeanValidationValidator>
+		implements IBeanValidationValidatorEditpart, LocaleListener {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(BeanValidationValidatorEditpart.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(BeanValidationValidatorEditpart.class);
 
 	private ValidationConfigToValidatorBridge bridgeObserver;
 
+	private BeanValidationValidator validator;
+
 	public BeanValidationValidatorEditpart() {
-		super(
-				ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS,
+		super(ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS,
 				ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS_FULLY_QUALIFIED_NAME,
 				ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_PROPERTY);
 	}
@@ -50,8 +52,8 @@
 	protected IValidator createValidator() {
 		YBeanValidationValidator yModel = getModel();
 
-		ValidatorFactory jsr303ValidatorFactory = (ValidatorFactory) getViewContext(
-				yModel).getService(ValidatorFactory.class.getName());
+		ValidatorFactory jsr303ValidatorFactory = (ValidatorFactory) getViewContext(yModel)
+				.getService(ValidatorFactory.class.getName());
 		if (jsr303ValidatorFactory == null) {
 			LOGGER.error("JSR303ValidatorFactory not available.");
 			return null;
@@ -59,47 +61,44 @@
 
 		Class<?> beanClass = yModel.getBvalClass();
 		if (beanClass == null) {
-			ITypeProviderService service = getViewContext(getModel())
-					.getService(ITypeProviderService.class.getName());
-			beanClass = service.forName(null, getModel()
-					.getBvalClassFullyQualifiedName());
+			ITypeProviderService service = getViewContext(getModel()).getService(ITypeProviderService.class.getName());
+			beanClass = service.forName(null, getModel().getBvalClassFullyQualifiedName());
 		}
 
-		YField yField = (YField) yModel.eContainer();
-		BeanValidationValidator validator = new BeanValidationValidator(
-				beanClass, yModel.getBvalProperty(), jsr303ValidatorFactory,
-				yField.getId(), yField.getLabelI18nKey());
 		IViewContext context = getViewContext(getModel());
-		validator.setI18nService((II18nService) context
-				.getService(II18nService.class.getName()));
-		validator.setLocale(context.getLocale());
+		YField yField = (YField) yModel.eContainer();
+		validator = new BeanValidationValidator(beanClass, yModel.getBvalProperty(), jsr303ValidatorFactory,
+				yField.getId(), yField.getLabelI18nKey(), context.getLocale());
+		validator.setI18nService((II18nService) context.getService(II18nService.class.getName()));
+
+		ILocaleChangedService localeChangedService = context.getService(ILocaleChangedService.ID);
+		localeChangedService.addLocaleListener(this);
+
 		return validator;
 	}
 
 	@Override
 	public void setConfig(IValidationConfig config) {
-		YMaxLengthValidationConfig validatable = (YMaxLengthValidationConfig) config
-				.getValidationSettings();
+		YBeanValidationValidatorConfig validatable = (YBeanValidationValidatorConfig) config.getValidationSettings();
 		// create an observer that transfers the changes at the validatable to
 		// the validator
 		Map<EStructuralFeature, EStructuralFeature> mapping = new HashMap<EStructuralFeature, EStructuralFeature>();
-		mapping.put(
-				ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS,
+		mapping.put(ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS,
 				ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS);
-		mapping.put(
-				ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS_FULLY_QUALIFIED_NAME,
+		mapping.put(ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS_FULLY_QUALIFIED_NAME,
 				ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS_FULLY_QUALIFIED_NAME);
-		mapping.put(
-				ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_PROPERTY,
+		mapping.put(ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_PROPERTY,
 				ValidationPackage.Literals.YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_PROPERTY);
 
-		bridgeObserver = new ValidationConfigToValidatorBridge(validatable,
-				getModel(), mapping);
+		bridgeObserver = new ValidationConfigToValidatorBridge(validatable, getModel(), mapping);
 	}
 
 	@Override
 	protected void internalDispose() {
 		try {
+			ILocaleChangedService localeChangedService = getContext().getService(ILocaleChangedService.ID);
+			localeChangedService.removeLocaleListener(this);
+
 			if (bridgeObserver != null) {
 				bridgeObserver.dispose();
 				bridgeObserver = null;
@@ -109,4 +108,9 @@
 		}
 	}
 
+	@Override
+	public void localeChanged(Locale locale) {
+		validator.setLocale(locale);
+	}
+
 }
diff --git a/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/validation/validator/BeanValidationValidator.java b/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/validation/validator/BeanValidationValidator.java
index 6fdb3c6..4fcd193 100644
--- a/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/validation/validator/BeanValidationValidator.java
+++ b/org.eclipse.osbp.ecview.core.common.editparts.emf/src/org/eclipse/osbp/ecview/core/common/editpart/emf/validation/validator/BeanValidationValidator.java
@@ -24,8 +24,10 @@
 import java.util.Set;
 
 import javax.validation.ConstraintViolation;
+import javax.validation.MessageInterpolator;
 import javax.validation.MessageInterpolator.Context;
 import javax.validation.Validator;
+import javax.validation.ValidatorContext;
 import javax.validation.ValidatorFactory;
 import javax.validation.metadata.ConstraintDescriptor;
 
@@ -43,42 +45,42 @@
 /**
  * The Class BeanValidationValidator.
  */
-public class BeanValidationValidator extends AbstractCollectingValidator
-		implements IValidator {
+public class BeanValidationValidator extends AbstractCollectingValidator implements IValidator {
 
 	/** The Constant LOGGER. */
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(BeanValidationValidator.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(BeanValidationValidator.class);
 
 	/** The bean class. */
 	private final Class<?> beanClass;
-	
+
 	/** The property name. */
 	private final String propertyName;
-	
+
 	/** The property class. */
 	private final Class<?> propertyClass;
-	
+
 	/** The locale. */
 	private Locale locale;
 
 	/** The i18n service. */
 	@SuppressWarnings("unused")
 	private II18nService i18nService;
-	
+
 	/** The javax bean validator factory. */
 	@SuppressWarnings("unused")
 	private final ValidatorFactory javaxBeanValidatorFactory;
-	
+
 	/** The javax bean validator. */
-	private final Validator javaxBeanValidator;
-	
+	private Validator javaxBeanValidator;
+
 	/** The field id. */
 	private final String fieldId;
-	
+
 	/** The field i18n key. */
 	private final String fieldI18nKey;
 
+	private MessageInterpolator messageInterpolator;
+
 	/**
 	 * Instantiates a new bean validation validator.
 	 *
@@ -92,12 +94,17 @@
 	 *            the field id
 	 * @param fieldI18nKey
 	 *            the field i18n key
+	 * @param locale
 	 */
-	public BeanValidationValidator(Class<?> beanClass, String propertyName,
-			ValidatorFactory jsr303ValidatorFactory, String fieldId,
-			String fieldI18nKey) {
+	public BeanValidationValidator(Class<?> beanClass, String propertyName, ValidatorFactory jsr303ValidatorFactory,
+			String fieldId, String fieldI18nKey, Locale locale) {
 		this.javaxBeanValidatorFactory = jsr303ValidatorFactory;
-		this.javaxBeanValidator = jsr303ValidatorFactory.getValidator();
+
+		messageInterpolator = ValidationUtil.createNewMessageInterpolator(locale);
+		ValidatorContext usingContext = jsr303ValidatorFactory.usingContext();
+		usingContext.messageInterpolator(messageInterpolator);
+		this.javaxBeanValidator = usingContext.getValidator();
+
 		this.beanClass = beanClass;
 		this.propertyClass = getPropertyType(beanClass, propertyName);
 		this.propertyName = propertyName;
@@ -116,17 +123,17 @@
 	 * @return the property type
 	 */
 	protected Class<?> getPropertyType(Class<?> beanClass, String propertyName) {
-		for (PropertyDescriptor desc : PropertyUtils
-				.getPropertyDescriptors(beanClass)) {
+		for (PropertyDescriptor desc : PropertyUtils.getPropertyDescriptors(beanClass)) {
 			if (desc.getName().equals(propertyName)) {
 				return desc.getPropertyType();
 			}
 		}
-		throw new IllegalStateException("Property " + propertyName
-				+ " not available in class " + beanClass.getName());
+		throw new IllegalStateException("Property " + propertyName + " not available in class " + beanClass.getName());
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.eclipse.osbp.ecview.core.common.validation.IValidator#getType()
 	 */
 	@Override
@@ -134,35 +141,39 @@
 		return propertyClass;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.validation.IValidator#isCheckValidType()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.ecview.core.common.validation.IValidator#
+	 * isCheckValidType()
 	 */
 	@Override
 	public boolean isCheckValidType() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.validation.IValidator#validateValue(java.lang.Object)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.validation.IValidator#validateValue(
+	 * java.lang.Object)
 	 */
 	@SuppressWarnings("rawtypes")
 	@Override
 	public IStatus validateValue(Object value) {
 		if (javaxBeanValidator == null) {
-			return Status.createStatus("", BeanValidationValidator.class,
-					IStatus.Severity.ERROR,
+			return Status.createStatus("", BeanValidationValidator.class, IStatus.Severity.ERROR,
 					"Error occured: javaxBeanValidator was null.");
 		}
 		Set<?> violations = null;
 		try {
 			Object convertedValue = value;
-			if (value != null && value instanceof Number
-					&& !propertyClass.isAssignableFrom(value.getClass())) {
+			if (value != null && value instanceof Number && !propertyClass.isAssignableFrom(value.getClass())) {
 				convertedValue = convertNumber((Number) value);
 			}
 
-			violations = javaxBeanValidator.validateValue(beanClass,
-					propertyName, convertedValue);
+			violations = javaxBeanValidator.validateValue(beanClass, propertyName, convertedValue);
 		} catch (Exception e) {
 			IStatus status = Status.createErrorStatus(e);
 			resetCurrentStatus();
@@ -176,8 +187,7 @@
 		}
 
 		@SuppressWarnings("unchecked")
-		Set<IStatus> status = ValidationUtil.getStatus(getClass(),
-				(Set<ConstraintViolation>) violations);
+		Set<IStatus> status = ValidationUtil.getStatus(getClass(), (Set<ConstraintViolation>) violations);
 
 		// fix the field id
 		for (IStatus s : status) {
@@ -203,11 +213,9 @@
 			return value.byteValue();
 		} else if (propertyClass == Short.class || propertyClass == Short.TYPE) {
 			return value.shortValue();
-		} else if (propertyClass == Integer.class
-				|| propertyClass == Integer.TYPE) {
+		} else if (propertyClass == Integer.class || propertyClass == Integer.TYPE) {
 			return value.intValue();
-		} else if (propertyClass == Double.class
-				|| propertyClass == Double.TYPE) {
+		} else if (propertyClass == Double.class || propertyClass == Double.TYPE) {
 			return value.doubleValue();
 		} else if (propertyClass == Float.class || propertyClass == Float.TYPE) {
 			return value.floatValue();
@@ -228,6 +236,7 @@
 	 */
 	public void setLocale(Locale locale) {
 		this.locale = locale;
+		ValidationUtil.updateLocale(messageInterpolator, locale);
 	}
 
 	/**
@@ -239,8 +248,12 @@
 		return locale;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.validation.IValidator#updateParameter(java.lang.Object)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.validation.IValidator#updateParameter
+	 * (java.lang.Object)
 	 */
 	@Override
 	public void updateParameter(Object model) {
@@ -248,16 +261,23 @@
 		LOGGER.error("Update parameter for BeanValidationValidator not allowed yet!");
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.validation.AbstractCollectingValidator#internalDispose()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.ecview.core.common.validation.
+	 * AbstractCollectingValidator#internalDispose()
 	 */
 	@Override
 	protected void internalDispose() {
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.validation.IValidator#setI18nService(org.eclipse.osbp.runtime.common.i18n.II18nService)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.validation.IValidator#setI18nService(
+	 * org.eclipse.osbp.runtime.common.i18n.II18nService)
 	 */
 	@Override
 	public void setI18nService(II18nService i18nService) {
@@ -273,7 +293,7 @@
 
 		/** The value. */
 		private final Object value;
-		
+
 		/** The descriptor. */
 		private final ConstraintDescriptor<?> descriptor;
 
@@ -291,15 +311,21 @@
 			this.descriptor = descriptor;
 		}
 
-		/* (non-Javadoc)
-		 * @see javax.validation.MessageInterpolator.Context#getConstraintDescriptor()
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * javax.validation.MessageInterpolator.Context#getConstraintDescriptor(
+		 * )
 		 */
 		@Override
 		public ConstraintDescriptor<?> getConstraintDescriptor() {
 			return descriptor;
 		}
 
-		/* (non-Javadoc)
+		/*
+		 * (non-Javadoc)
+		 * 
 		 * @see javax.validation.MessageInterpolator.Context#getValidatedValue()
 		 */
 		@Override
@@ -307,8 +333,11 @@
 			return value;
 		}
 
-		/* (non-Javadoc)
-		 * @see javax.validation.MessageInterpolator.Context#unwrap(java.lang.Class)
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * javax.validation.MessageInterpolator.Context#unwrap(java.lang.Class)
 		 */
 		public <T> T unwrap(Class<T> arg0) {
 			return null;
diff --git a/org.eclipse.osbp.ecview.core.common.model.edit/.project b/org.eclipse.osbp.ecview.core.common.model.edit/.project
index 3e38597..f87c53d 100644
--- a/org.eclipse.osbp.ecview.core.common.model.edit/.project
+++ b/org.eclipse.osbp.ecview.core.common.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.core.common.model.edit/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.common.model.edit/META-INF/MANIFEST.MF
index f1a3a99..688c1a5 100644
--- a/org.eclipse.osbp.ecview.core.common.model.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.common.model.edit/META-INF/MANIFEST.MF
@@ -6,9 +6,8 @@
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.osbp.ecview.core.common.model.binding.provider.ECViewCoreEditPlugin$Implementation
 Bundle-Vendor: Eclipse OSBP
- Germany)
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.osbp.ecview.core.common.model.binding.provider,
  org.eclipse.osbp.ecview.core.common.model.core.authorization.provider,
  org.eclipse.osbp.ecview.core.common.model.core.provider,
@@ -16,6 +15,6 @@
  org.eclipse.osbp.ecview.core.common.model.validation.provider,
  org.eclipse.osbp.ecview.core.common.model.visibility.provider
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.osbp.ecview.core.common.model;visibility:=reexport,
+ org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.eclipse.emf.edit;visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.osbp.ecview.core.common.model.edit/META-INF/MANIFEST.MF_old b/org.eclipse.osbp.ecview.core.common.model.edit/META-INF/MANIFEST.MF_old
index 193893e..2264efb 100644
--- a/org.eclipse.osbp.ecview.core.common.model.edit/META-INF/MANIFEST.MF_old
+++ b/org.eclipse.osbp.ecview.core.common.model.edit/META-INF/MANIFEST.MF_old
@@ -7,7 +7,7 @@
 Bundle-Activator: org.eclipse.osbp.ecview.core.common.model.binding.provider.ECViewCoreEditPlugin$Implementation
 Bundle-Vendor: Loetz GmbH&Co.KG - 69115 Heidelberg - Germany
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.osbp.ecview.core.common.model.binding.provider;version="0.9.0",
  org.eclipse.osbp.ecview.core.common.model.core.authorization.provider,
  org.eclipse.osbp.ecview.core.common.model.core.provider;version="0.9.0",
diff --git a/org.eclipse.osbp.ecview.core.common.model.edit/plugin.properties b/org.eclipse.osbp.ecview.core.common.model.edit/plugin.properties
index 770562d..49fed19 100644
--- a/org.eclipse.osbp.ecview.core.common.model.edit/plugin.properties
+++ b/org.eclipse.osbp.ecview.core.common.model.edit/plugin.properties
@@ -396,3 +396,26 @@
 _UI_YDetailBeanSlot_propertyPath_feature = Property Path
 _UI_YEmbeddable_label_feature = Label
 _UI_YEmbeddable_labelI18nKey_feature = Label I1 8n Key
+_UI_YFocusNotifier_type = YFocus Notifier
+_UI_YBlurNotifier_type = YBlur Notifier
+_UI_YTextChangeNotifier_type = YText Change Notifier
+_UI_YEmbeddableEvent_type = YEmbeddable Event
+_UI_YContextClickEvent_type = YContext Click Event
+_UI_YUniqueAttributeValidator_type = YUnique Attribute Validator
+_UI_YUniqueAttributeValidatorConfig_type = YUnique Attribute Validator Config
+_UI_YLayout_lastComponentAttach_feature = Last Component Attach
+_UI_YLayout_lastComponentDetach_feature = Last Component Detach
+_UI_YEmbeddable_lastContextClick_feature = Last Context Click
+_UI_YEmbeddable_layoutIdx_feature = Layout Idx
+_UI_YFocusNotifier_lastFocusEvent_feature = Last Focus Event
+_UI_YBlurNotifier_lastBlurEvent_feature = Last Blur Event
+_UI_YTextChangeNotifier_lastTextChange_feature = Last Text Change
+_UI_YEmbeddableEvent_time_feature = Time
+_UI_YEmbeddableEvent_embeddable_feature = Embeddable
+_UI_YEmbeddableEvent_rawEvent_feature = Raw Event
+_UI_YUniqueAttributeValidatorConfig_valType_feature = Val Type
+_UI_YUniqueAttributeValidatorConfig_valTypeFullyQualifiedName_feature = Val Type Fully Qualified Name
+_UI_YUniqueAttributeValidatorConfig_propertyPath_feature = Property Path
+_UI_YUniqueAttributeValidatorConfig_containerValueBindingEndpoint_feature = Container Value Binding Endpoint
+_UI_YFocusable_layoutIdx_feature = Layout Idx
+_UI_YFocusable_layoutColumns_feature = Layout Columns
diff --git a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/CoreModelItemProviderAdapterFactory.java b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/CoreModelItemProviderAdapterFactory.java
index 26c4e98..8f4b42e 100644
--- a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/CoreModelItemProviderAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/CoreModelItemProviderAdapterFactory.java
@@ -671,6 +671,52 @@
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YEmbeddableEventItemProvider yEmbeddableEventItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createYEmbeddableEventAdapter() {
+		if (yEmbeddableEventItemProvider == null) {
+			yEmbeddableEventItemProvider = new YEmbeddableEventItemProvider(this);
+		}
+
+		return yEmbeddableEventItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.core.common.model.core.YContextClickEvent} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YContextClickEventItemProvider yContextClickEventItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.core.common.model.core.YContextClickEvent}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createYContextClickEventAdapter() {
+		if (yContextClickEventItemProvider == null) {
+			yContextClickEventItemProvider = new YContextClickEventItemProvider(this);
+		}
+
+		return yContextClickEventItemProvider;
+	}
+
+	/**
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -821,6 +867,8 @@
 		if (ySendEventCommandItemProvider != null) ySendEventCommandItemProvider.dispose();
 		if (yKeyStrokeDefinitionItemProvider != null) yKeyStrokeDefinitionItemProvider.dispose();
 		if (yDelegateConverterItemProvider != null) yDelegateConverterItemProvider.dispose();
+		if (yEmbeddableEventItemProvider != null) yEmbeddableEventItemProvider.dispose();
+		if (yContextClickEventItemProvider != null) yContextClickEventItemProvider.dispose();
 	}
 
 }
diff --git a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YEmbeddableItemProvider.java b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YEmbeddableItemProvider.java
index efebfa5..e8cb0df 100644
--- a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YEmbeddableItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YEmbeddableItemProvider.java
@@ -86,6 +86,7 @@
 			addMementoIdPropertyDescriptor(object);
 			addLabelPropertyDescriptor(object);
 			addLabelI18nKeyPropertyDescriptor(object);
+			addLastContextClickPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -377,6 +378,28 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Context Click feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastContextClickPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YEmbeddable_lastContextClick_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YEmbeddable_lastContextClick_feature", "_UI_YEmbeddable_type"),
+				 CoreModelPackage.Literals.YEMBEDDABLE__LAST_CONTEXT_CLICK,
+				 true,
+				 false,
+				 true,
+				 null,
+				 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}.
diff --git a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YFieldItemProvider.java b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YFieldItemProvider.java
index 029df36..b2bb288 100644
--- a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YFieldItemProvider.java
@@ -61,6 +61,8 @@
 			addEditablePropertyDescriptor(object);
 			addInitialEnabledPropertyDescriptor(object);
 			addEnabledPropertyDescriptor(object);
+			addLayoutIdxPropertyDescriptor(object);
+			addLayoutColumnsPropertyDescriptor(object);
 			addTabIndexPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -155,6 +157,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Layout Idx feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutIdxPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutIdx_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutIdx_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_IDX,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Layout Columns feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutColumnsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutColumns_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutColumns_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_COLUMNS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Tab Index feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -250,6 +296,8 @@
 			case CoreModelPackage.YFIELD__EDITABLE:
 			case CoreModelPackage.YFIELD__INITIAL_ENABLED:
 			case CoreModelPackage.YFIELD__ENABLED:
+			case CoreModelPackage.YFIELD__LAYOUT_IDX:
+			case CoreModelPackage.YFIELD__LAYOUT_COLUMNS:
 			case CoreModelPackage.YFIELD__TAB_INDEX:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
@@ -300,6 +348,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__VALIDATORS,
+				 ValidationFactory.eINSTANCE.createYUniqueAttributeValidator()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__INTERNAL_VALIDATORS,
 				 ValidationFactory.eINSTANCE.createYMinLengthValidator()));
 
@@ -325,6 +378,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YFIELD__INTERNAL_VALIDATORS,
+				 ValidationFactory.eINSTANCE.createYUniqueAttributeValidator()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(CoreModelPackage.Literals.YFIELD__CONVERTER,
 				 CoreModelFactory.eINSTANCE.createYDelegateConverter()));
 	}
diff --git a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YLayoutItemProvider.java b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YLayoutItemProvider.java
index c1329ae..c85f35e 100644
--- a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YLayoutItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/core/provider/YLayoutItemProvider.java
@@ -60,6 +60,8 @@
 			addEditablePropertyDescriptor(object);
 			addInitialEnabledPropertyDescriptor(object);
 			addEnabledPropertyDescriptor(object);
+			addLastComponentAttachPropertyDescriptor(object);
+			addLastComponentDetachPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -153,6 +155,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Component Attach feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastComponentAttachPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YLayout_lastComponentAttach_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YLayout_lastComponentAttach_feature", "_UI_YLayout_type"),
+				 CoreModelPackage.Literals.YLAYOUT__LAST_COMPONENT_ATTACH,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Component Detach feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastComponentDetachPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YLayout_lastComponentDetach_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YLayout_lastComponentDetach_feature", "_UI_YLayout_type"),
+				 CoreModelPackage.Literals.YLAYOUT__LAST_COMPONENT_DETACH,
+				 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}.
@@ -224,6 +270,8 @@
 			case CoreModelPackage.YLAYOUT__EDITABLE:
 			case CoreModelPackage.YLAYOUT__INITIAL_ENABLED:
 			case CoreModelPackage.YLAYOUT__ENABLED:
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_ATTACH:
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_DETACH:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case CoreModelPackage.YLAYOUT__ELEMENTS:
diff --git a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/validation/provider/ValidationItemProviderAdapterFactory.java b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/validation/provider/ValidationItemProviderAdapterFactory.java
index 9a217c1..4ec93ab 100644
--- a/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/validation/provider/ValidationItemProviderAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.core.common.model.edit/src/org/eclipse/osbp/ecview/core/common/model/validation/provider/ValidationItemProviderAdapterFactory.java
@@ -210,6 +210,29 @@
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidator} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YUniqueAttributeValidatorItemProvider yUniqueAttributeValidatorItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidator}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createYUniqueAttributeValidatorAdapter() {
+		if (yUniqueAttributeValidatorItemProvider == null) {
+			yUniqueAttributeValidatorItemProvider = new YUniqueAttributeValidatorItemProvider(this);
+		}
+
+		return yUniqueAttributeValidatorItemProvider;
+	}
+
+	/**
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -340,6 +363,7 @@
 		if (yRegexpValidatorItemProvider != null) yRegexpValidatorItemProvider.dispose();
 		if (yClassDelegateValidatorItemProvider != null) yClassDelegateValidatorItemProvider.dispose();
 		if (yBeanValidationValidatorItemProvider != null) yBeanValidationValidatorItemProvider.dispose();
+		if (yUniqueAttributeValidatorItemProvider != null) yUniqueAttributeValidatorItemProvider.dispose();
 	}
 
 }
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.common.model.editor/META-INF/MANIFEST.MF
index 53885eb..64ffd5e 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/META-INF/MANIFEST.MF
@@ -7,8 +7,9 @@
 Bundle-Activator: org.eclipse.osbp.ecview.core.common.model.binding.presentation.ECViewCoreEditorPlugin$Implementation
 Bundle-Vendor: Eclipse OSBP
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.osbp.ecview.core.common.model.binding.presentation;version="0.9.0",
+ org.eclipse.osbp.ecview.core.common.model.core.authorization.presentation,
  org.eclipse.osbp.ecview.core.common.model.core.presentation;version="0.9.0",
  org.eclipse.osbp.ecview.core.common.model.datatypes.presentation;version="0.9.0",
  org.eclipse.osbp.ecview.core.common.model.validation.presentation;version="0.9.0",
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/plugin.properties b/org.eclipse.osbp.ecview.core.common.model.editor/plugin.properties
index a94ba2d..14ae9fb 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/plugin.properties
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/plugin.properties
Binary files differ
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/plugin.xml b/org.eclipse.osbp.ecview.core.common.model.editor/plugin.xml
index 6f9768e..a46a6af 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/plugin.xml
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/plugin.xml
@@ -68,6 +68,34 @@
             id="org.eclipse.emf.ecore.Wizard.category.ID"
             name="%_UI_Wizard_category"/>
       <wizard
+            id="org.eclipse.osbp.ecview.core.common.model.core.authorization.presentation.AuthorizationModelWizardID"
+            name="%_UI_AuthorizationModelWizard_label"
+            class="org.eclipse.osbp.ecview.core.common.model.core.authorization.presentation.AuthorizationModelWizard"
+            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            icon="icons/full/obj16/AuthorizationModelFile.gif">
+         <description>%_UI_AuthorizationModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated core -->
+      <editor
+            id="org.eclipse.osbp.ecview.core.common.model.core.authorization.presentation.AuthorizationEditorID"
+            name="%_UI_AuthorizationEditor_label"
+            icon="icons/full/obj16/AuthorizationModelFile.gif"
+            extensions="authorization"
+            class="org.eclipse.osbp.ecview.core.common.model.core.authorization.presentation.AuthorizationEditor"
+            contributorClass="org.eclipse.osbp.ecview.core.common.model.core.authorization.presentation.AuthorizationActionBarContributor">
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated core -->
+      <category
+            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            name="%_UI_Wizard_category"/>
+      <wizard
             id="org.eclipse.osbp.ecview.core.common.model.validation.presentation.ValidationModelWizardID"
             name="%_UI_ValidationModelWizard_label"
             class="org.eclipse.osbp.ecview.core.common.model.validation.presentation.ValidationModelWizard"
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/binding/presentation/BindingEditor.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/binding/presentation/BindingEditor.java
index 40096da..273ffac 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/binding/presentation/BindingEditor.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/binding/presentation/BindingEditor.java
@@ -167,6 +167,7 @@
 
 import org.eclipse.osbp.ecview.core.common.model.binding.provider.BindingItemProviderAdapterFactory;
 
+import org.eclipse.osbp.ecview.core.common.model.core.authorization.provider.AuthorizationItemProviderAdapterFactory;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
 import org.eclipse.osbp.ecview.core.common.model.core.provider.CoreModelItemProviderAdapterFactory;
@@ -722,6 +723,7 @@
 		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new BindingItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new CoreModelItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new AuthorizationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ValidationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new DatatypesItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new VisibilityItemProviderAdapterFactory());
@@ -972,7 +974,7 @@
 	 * @generated
 	 */
 	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
 		Exception exception = null;
 		Resource resource = null;
 		try {
@@ -1000,10 +1002,11 @@
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
-					(Diagnostic.ERROR,
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
 					 "org.eclipse.osbp.ecview.core.common.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/binding/presentation/BindingModelWizard.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/binding/presentation/BindingModelWizard.java
index 3d7f17e..a4a379a 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/binding/presentation/BindingModelWizard.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/binding/presentation/BindingModelWizard.java
@@ -406,8 +406,7 @@
 		 * @generated
 		 */
 		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			{
+			Composite composite = new Composite(parent, SWT.NONE); {
 				GridLayout layout = new GridLayout();
 				layout.numColumns = 1;
 				layout.verticalSpacing = 12;
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/core/presentation/CoreModelEditor.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/core/presentation/CoreModelEditor.java
index 2444078..f2056c0 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/core/presentation/CoreModelEditor.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/core/presentation/CoreModelEditor.java
@@ -173,6 +173,7 @@
 
 import org.eclipse.osbp.ecview.core.common.model.binding.provider.BindingItemProviderAdapterFactory;
 
+import org.eclipse.osbp.ecview.core.common.model.core.authorization.provider.AuthorizationItemProviderAdapterFactory;
 import org.eclipse.osbp.ecview.core.common.model.datatypes.provider.DatatypesItemProviderAdapterFactory;
 
 import org.eclipse.osbp.ecview.core.common.model.validation.provider.ValidationItemProviderAdapterFactory;
@@ -724,6 +725,7 @@
 		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new BindingItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new CoreModelItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new AuthorizationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ValidationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new DatatypesItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new VisibilityItemProviderAdapterFactory());
@@ -974,7 +976,7 @@
 	 * @generated
 	 */
 	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
 		Exception exception = null;
 		Resource resource = null;
 		try {
@@ -1002,10 +1004,11 @@
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
-					(Diagnostic.ERROR,
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
 					 "org.eclipse.osbp.ecview.core.common.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/core/presentation/CoreModelModelWizard.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/core/presentation/CoreModelModelWizard.java
index 488c67c..fd96e81 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/core/presentation/CoreModelModelWizard.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/core/presentation/CoreModelModelWizard.java
@@ -408,8 +408,7 @@
 		 * @generated
 		 */
 		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			{
+			Composite composite = new Composite(parent, SWT.NONE); {
 				GridLayout layout = new GridLayout();
 				layout.numColumns = 1;
 				layout.verticalSpacing = 12;
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/datatypes/presentation/DatatypesEditor.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/datatypes/presentation/DatatypesEditor.java
index 091fe44..2667dd5 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/datatypes/presentation/DatatypesEditor.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/datatypes/presentation/DatatypesEditor.java
@@ -173,6 +173,7 @@
 
 import org.eclipse.osbp.ecview.core.common.model.binding.provider.BindingItemProviderAdapterFactory;
 
+import org.eclipse.osbp.ecview.core.common.model.core.authorization.provider.AuthorizationItemProviderAdapterFactory;
 import org.eclipse.osbp.ecview.core.common.model.core.provider.CoreModelItemProviderAdapterFactory;
 
 import org.eclipse.osbp.ecview.core.common.model.validation.provider.ValidationItemProviderAdapterFactory;
@@ -724,6 +725,7 @@
 		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new BindingItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new CoreModelItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new AuthorizationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ValidationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new DatatypesItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new VisibilityItemProviderAdapterFactory());
@@ -974,7 +976,7 @@
 	 * @generated
 	 */
 	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
 		Exception exception = null;
 		Resource resource = null;
 		try {
@@ -1002,10 +1004,11 @@
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
-					(Diagnostic.ERROR,
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
 					 "org.eclipse.osbp.ecview.core.common.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/datatypes/presentation/DatatypesModelWizard.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/datatypes/presentation/DatatypesModelWizard.java
index 7ed055d..481edaf 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/datatypes/presentation/DatatypesModelWizard.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/datatypes/presentation/DatatypesModelWizard.java
@@ -408,8 +408,7 @@
 		 * @generated
 		 */
 		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			{
+			Composite composite = new Composite(parent, SWT.NONE); {
 				GridLayout layout = new GridLayout();
 				layout.numColumns = 1;
 				layout.verticalSpacing = 12;
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/validation/presentation/ValidationEditor.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/validation/presentation/ValidationEditor.java
index 2e9fa11..24a0d1b 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/validation/presentation/ValidationEditor.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/validation/presentation/ValidationEditor.java
@@ -173,6 +173,7 @@
 
 import org.eclipse.osbp.ecview.core.common.model.binding.provider.BindingItemProviderAdapterFactory;
 
+import org.eclipse.osbp.ecview.core.common.model.core.authorization.provider.AuthorizationItemProviderAdapterFactory;
 import org.eclipse.osbp.ecview.core.common.model.core.provider.CoreModelItemProviderAdapterFactory;
 
 import org.eclipse.osbp.ecview.core.common.model.datatypes.provider.DatatypesItemProviderAdapterFactory;
@@ -724,6 +725,7 @@
 		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new BindingItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new CoreModelItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new AuthorizationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ValidationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new DatatypesItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new VisibilityItemProviderAdapterFactory());
@@ -974,7 +976,7 @@
 	 * @generated
 	 */
 	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
 		Exception exception = null;
 		Resource resource = null;
 		try {
@@ -1002,10 +1004,11 @@
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
-					(Diagnostic.ERROR,
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
 					 "org.eclipse.osbp.ecview.core.common.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/validation/presentation/ValidationModelWizard.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/validation/presentation/ValidationModelWizard.java
index 6124519..8033fdd 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/validation/presentation/ValidationModelWizard.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/validation/presentation/ValidationModelWizard.java
@@ -408,8 +408,7 @@
 		 * @generated
 		 */
 		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			{
+			Composite composite = new Composite(parent, SWT.NONE); {
 				GridLayout layout = new GridLayout();
 				layout.numColumns = 1;
 				layout.verticalSpacing = 12;
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/visibility/presentation/VisibilityEditor.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/visibility/presentation/VisibilityEditor.java
index 5c2b96d..99ebcf3 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/visibility/presentation/VisibilityEditor.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/visibility/presentation/VisibilityEditor.java
@@ -173,6 +173,7 @@
 
 import org.eclipse.osbp.ecview.core.common.model.binding.provider.BindingItemProviderAdapterFactory;
 
+import org.eclipse.osbp.ecview.core.common.model.core.authorization.provider.AuthorizationItemProviderAdapterFactory;
 import org.eclipse.osbp.ecview.core.common.model.core.provider.CoreModelItemProviderAdapterFactory;
 
 import org.eclipse.osbp.ecview.core.common.model.datatypes.provider.DatatypesItemProviderAdapterFactory;
@@ -724,6 +725,7 @@
 		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new BindingItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new CoreModelItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new AuthorizationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new ValidationItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new DatatypesItemProviderAdapterFactory());
 		adapterFactory.addAdapterFactory(new VisibilityItemProviderAdapterFactory());
@@ -974,7 +976,7 @@
 	 * @generated
 	 */
 	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
 		Exception exception = null;
 		Resource resource = null;
 		try {
@@ -1002,10 +1004,11 @@
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
-					(Diagnostic.ERROR,
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
 					 "org.eclipse.osbp.ecview.core.common.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
diff --git a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/visibility/presentation/VisibilityModelWizard.java b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/visibility/presentation/VisibilityModelWizard.java
index ecdfc94..7a38e17 100644
--- a/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/visibility/presentation/VisibilityModelWizard.java
+++ b/org.eclipse.osbp.ecview.core.common.model.editor/src/org/eclipse/osbp/ecview/core/common/model/visibility/presentation/VisibilityModelWizard.java
@@ -408,8 +408,7 @@
 		 * @generated
 		 */
 		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			{
+			Composite composite = new Composite(parent, SWT.NONE); {
 				GridLayout layout = new GridLayout();
 				layout.numColumns = 1;
 				layout.verticalSpacing = 12;
diff --git a/org.eclipse.osbp.ecview.core.common.model.tests/.project b/org.eclipse.osbp.ecview.core.common.model.tests/.project
index b328f36..f7b4052 100644
--- a/org.eclipse.osbp.ecview.core.common.model.tests/.project
+++ b/org.eclipse.osbp.ecview.core.common.model.tests/.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,22 +25,10 @@
 			<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.pde.PluginNature</nature>
 		<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.core.common.model.tests/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.common.model.tests/META-INF/MANIFEST.MF
index 56e089e..862bc19 100644
--- a/org.eclipse.osbp.ecview.core.common.model.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.common.model.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,22 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.osbp.ecview.core.common.model.tests
-Bundle-SymbolicName: org.eclipse.osbp.ecview.core.common.model.tests
-Bundle-Vendor: Eclipse OSBP
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.osbp.ecview.core.common.model.tests;singleton:=true
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
 Bundle-Version: 0.9.0.qualifier
-Require-Bundle: org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)",
- org.junit;bundle-version="4.10.0",
+Bundle-ClassPath: .
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.junit;bundle-version="4.10.0";visibility:=reexport,
  org.eclipse.equinox.ds;bundle-version="1.4.100"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.osbp.ecview.core.common.model.binding.tests,
+ org.eclipse.osbp.ecview.core.common.model.core.authorization.tests,
+ org.eclipse.osbp.ecview.core.common.model.core.tests,
+ org.eclipse.osbp.ecview.core.common.model.datatypes.tests,
+ org.eclipse.osbp.ecview.core.common.model.validation.tests,
+ org.eclipse.osbp.ecview.core.common.model.visibility.tests
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.emf.ecore.xmi.impl
diff --git a/org.eclipse.osbp.ecview.core.common.model/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.common.model/META-INF/MANIFEST.MF
index 34f7c07..995bd09 100644
--- a/org.eclipse.osbp.ecview.core.common.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.common.model/META-INF/MANIFEST.MF
@@ -5,9 +5,8 @@
 Bundle-Version: 0.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse OSBP
- Germany)
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.osbp.ecview.core.common.model.binding;version="0.9.0";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.common.util,
diff --git a/org.eclipse.osbp.ecview.core.common.model/model/core.ecore b/org.eclipse.osbp.ecview.core.common.model/model/core.ecore
index 83af7b9..b79b3e6 100644
--- a/org.eclipse.osbp.ecview.core.common.model/model/core.ecore
+++ b/org.eclipse.osbp.ecview.core.common.model/model/core.ecore
@@ -17,6 +17,10 @@
   <eClassifiers xsi:type="ecore:EClass" name="YLayout" eSuperTypes="#//YEmbeddable #//YEditable #//YEnable">
     <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
         eType="#//YEmbeddable" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastComponentAttach" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastComponentDetach" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="YHelperLayoutProvider" abstract="true"
       interface="true">
@@ -151,6 +155,8 @@
         volatile="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelI18nKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         volatile="true" derived="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lastContextClick" eType="#//YContextClickEvent"
+        transient="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="YDialog" eSuperTypes="#//YElement #//YValueBindable #//YCssAble">
     <eStructuralFeatures xsi:type="ecore:EReference" name="content" eType="#//YEmbeddable"
@@ -223,6 +229,8 @@
         transient="true" defaultValueLiteral="true" derived="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="YFocusable" abstract="true" interface="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="layoutIdx" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="layoutColumns" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="tabIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="-1"/>
   </eClassifiers>
@@ -456,6 +464,26 @@
   <eClassifiers xsi:type="ecore:EClass" name="YTaggable" abstract="true" interface="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="tags" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="YFocusNotifier" abstract="true" interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lastFocusEvent" eType="#//YEmbeddableEvent"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="YBlurNotifier" abstract="true" interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lastBlurEvent" eType="#//YEmbeddableEvent"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="YTextChangeNotifier" abstract="true"
+      interface="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastTextChange" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="YEmbeddableEvent">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="time" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="embeddable" eType="#//YEmbeddable"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rawEvent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="YContextClickEvent" eSuperTypes="#//YEmbeddableEvent"/>
   <eSubpackages name="authorization" nsURI="http://osbp.eclipse.org/ecview/v1/core/view/authorization"
       nsPrefix="authorization">
     <eClassifiers xsi:type="ecore:EClass" name="YAuthorizationStore">
diff --git a/org.eclipse.osbp.ecview.core.common.model/model/validation.ecore b/org.eclipse.osbp.ecview.core.common.model/model/validation.ecore
index cf4ec73..386f460 100644
--- a/org.eclipse.osbp.ecview.core.common.model/model/validation.ecore
+++ b/org.eclipse.osbp.ecview.core.common.model/model/validation.ecore
@@ -14,6 +14,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="YRegexpValidator" eSuperTypes="#//YValidator #//YRegexpValidationConfig"/>
   <eClassifiers xsi:type="ecore:EClass" name="YClassDelegateValidator" eSuperTypes="#//YValidator #//YClassDelegateValidationConfig"/>
   <eClassifiers xsi:type="ecore:EClass" name="YBeanValidationValidator" eSuperTypes="#//YValidator #//YBeanValidationValidatorConfig"/>
+  <eClassifiers xsi:type="ecore:EClass" name="YUniqueAttributeValidator" eSuperTypes="#//YValidator #//YUniqueAttributeValidatorConfig"/>
   <eClassifiers xsi:type="ecore:EClass" name="YValidationConfig" abstract="true" interface="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultErrorMessage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -49,4 +50,17 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="bvalProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="YUniqueAttributeValidatorConfig" abstract="true"
+      interface="true" eSuperTypes="#//YValidationConfig">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valType">
+      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
+        <eTypeArguments/>
+      </eGenericType>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valTypeFullyQualifiedName"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertyPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="containerValueBindingEndpoint"
+        eType="ecore:EClass binding.ecore#//YValueBindingEndpoint" containment="true"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBeanValueBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBeanValueBindingEndpoint.java
index b31d0fa..6ec9cac 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBeanValueBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBeanValueBindingEndpoint.java
@@ -18,11 +18,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YBeanValueBindingEndpoint#getBean <em>Bean</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YBeanValueBindingEndpoint#getPropertyPath <em>Property Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYBeanValueBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBinding.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBinding.java
index ce1b07f..3281ba7 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBinding.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBinding.java
@@ -21,11 +21,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YBinding#getModelToTargetStrategy <em>Model To Target Strategy</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YBinding#getTargetToModelStrategy <em>Target To Model Strategy</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYBinding()
  * @model abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBindingSet.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBindingSet.java
index f040965..853aeb9 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBindingSet.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBindingSet.java
@@ -21,11 +21,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YBindingSet#getBindings <em>Bindings</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YBindingSet#getTransientBindings <em>Transient Bindings</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYBindingSet()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBindingUpdateStrategy.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBindingUpdateStrategy.java
index 57fe924..d175d99 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBindingUpdateStrategy.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YBindingUpdateStrategy.java
@@ -126,6 +126,8 @@
 	/**
 	 * Returns the '<em><b>YBinding Update Strategy</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YBindingUpdateStrategy get(String literal) {
@@ -141,6 +143,8 @@
 	/**
 	 * Returns the '<em><b>YBinding Update Strategy</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YBindingUpdateStrategy getByName(String name) {
@@ -156,6 +160,8 @@
 	/**
 	 * Returns the '<em><b>YBinding Update Strategy</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YBindingUpdateStrategy get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YDetailValueBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YDetailValueBindingEndpoint.java
index f3535ac..b4862c9 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YDetailValueBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YDetailValueBindingEndpoint.java
@@ -21,13 +21,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YDetailValueBindingEndpoint#getMasterObservable <em>Master Observable</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YDetailValueBindingEndpoint#getFeatures <em>Features</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YDetailValueBindingEndpoint#getPropertyPath <em>Property Path</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YDetailValueBindingEndpoint#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYDetailValueBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YECViewModelListBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YECViewModelListBindingEndpoint.java
index 9bb4ec4..dc54c99 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YECViewModelListBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YECViewModelListBindingEndpoint.java
@@ -21,6 +21,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YECViewModelListBindingEndpoint#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YECViewModelListBindingEndpoint#getFeatures <em>Features</em>}</li>
@@ -29,7 +30,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YECViewModelListBindingEndpoint#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YECViewModelListBindingEndpoint#getEmfNsURI <em>Emf Ns URI</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYECViewModelListBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YECViewModelValueBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YECViewModelValueBindingEndpoint.java
index 5bae5a6..a4d9ed2 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YECViewModelValueBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YECViewModelValueBindingEndpoint.java
@@ -21,6 +21,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YECViewModelValueBindingEndpoint#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YECViewModelValueBindingEndpoint#getFeatures <em>Features</em>}</li>
@@ -29,7 +30,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YECViewModelValueBindingEndpoint#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YECViewModelValueBindingEndpoint#getEmfNsURI <em>Emf Ns URI</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYECViewModelValueBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YEnumListBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YEnumListBindingEndpoint.java
index 803299e..eb54c49 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YEnumListBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YEnumListBindingEndpoint.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YEnumListBindingEndpoint#getEnum <em>Enum</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYEnumListBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YListBinding.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YListBinding.java
index 5fc55b3..6285ed1 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YListBinding.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YListBinding.java
@@ -18,11 +18,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YListBinding#getTargetEndpoint <em>Target Endpoint</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YListBinding#getModelEndpoint <em>Model Endpoint</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYListBinding()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YNoOpListBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YNoOpListBindingEndpoint.java
index 400dd3c..51f92c0 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YNoOpListBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YNoOpListBindingEndpoint.java
@@ -23,10 +23,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YNoOpListBindingEndpoint#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYNoOpListBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YNoOpValueBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YNoOpValueBindingEndpoint.java
index 2fe3be5..13df896 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YNoOpValueBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YNoOpValueBindingEndpoint.java
@@ -23,10 +23,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YNoOpValueBindingEndpoint#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYNoOpValueBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YValueBinding.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YValueBinding.java
index 93f0bb9..ffc3b3d 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YValueBinding.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YValueBinding.java
@@ -18,11 +18,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YValueBinding#getTargetEndpoint <em>Target Endpoint</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YValueBinding#getModelEndpoint <em>Model Endpoint</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYValueBinding()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YVisibilityProcessorValueBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YVisibilityProcessorValueBindingEndpoint.java
index 54396e8..4337fc0 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YVisibilityProcessorValueBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/YVisibilityProcessorValueBindingEndpoint.java
@@ -18,11 +18,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YVisibilityProcessorValueBindingEndpoint#getProcessorInstance <em>Processor Instance</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.YVisibilityProcessorValueBindingEndpoint#getProperty <em>Property</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage#getYVisibilityProcessorValueBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBeanValueBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBeanValueBindingEndpointImpl.java
index b998d22..891d331 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBeanValueBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBeanValueBindingEndpointImpl.java
@@ -24,11 +24,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBeanValueBindingEndpointImpl#getBean <em>Bean</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBeanValueBindingEndpointImpl#getPropertyPath <em>Property Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingEndpointImpl.java
index b5614e4..553349b 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingEndpointImpl.java
@@ -36,13 +36,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingEndpointImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingEndpointImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingEndpointImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingEndpointImpl#getProperties <em>Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingImpl.java
index 58af179..a93a27d 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingImpl.java
@@ -39,6 +39,7 @@
  * <em><b>YBinding</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingImpl#getId <em>Id</em>}</li>
@@ -47,7 +48,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingImpl#getModelToTargetStrategy <em>Model To Target Strategy</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingImpl#getTargetToModelStrategy <em>Target To Model Strategy</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingSetImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingSetImpl.java
index dd46e88..6733d6e 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingSetImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YBindingSetImpl.java
@@ -45,6 +45,7 @@
  * <em><b>YBinding Set</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingSetImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingSetImpl#getId <em>Id</em>}</li>
@@ -53,7 +54,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingSetImpl#getBindings <em>Bindings</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YBindingSetImpl#getTransientBindings <em>Transient Bindings</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YDetailValueBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YDetailValueBindingEndpointImpl.java
index 8082125..dc51225 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YDetailValueBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YDetailValueBindingEndpointImpl.java
@@ -32,13 +32,13 @@
  * <em><b>YDetail Value Binding Endpoint</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YDetailValueBindingEndpointImpl#getMasterObservable <em>Master Observable</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YDetailValueBindingEndpointImpl#getFeatures <em>Features</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YDetailValueBindingEndpointImpl#getPropertyPath <em>Property Path</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YDetailValueBindingEndpointImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YECViewModelListBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YECViewModelListBindingEndpointImpl.java
index 2de1a07..d5cbb16 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YECViewModelListBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YECViewModelListBindingEndpointImpl.java
@@ -31,6 +31,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YECViewModelListBindingEndpointImpl#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YECViewModelListBindingEndpointImpl#getFeatures <em>Features</em>}</li>
@@ -39,7 +40,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YECViewModelListBindingEndpointImpl#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YECViewModelListBindingEndpointImpl#getEmfNsURI <em>Emf Ns URI</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YECViewModelValueBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YECViewModelValueBindingEndpointImpl.java
index 133ed5f..21de467 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YECViewModelValueBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YECViewModelValueBindingEndpointImpl.java
@@ -31,6 +31,7 @@
  * <em><b>YEC View Model Value Binding Endpoint</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YECViewModelValueBindingEndpointImpl#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YECViewModelValueBindingEndpointImpl#getFeatures <em>Features</em>}</li>
@@ -39,7 +40,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YECViewModelValueBindingEndpointImpl#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YECViewModelValueBindingEndpointImpl#getEmfNsURI <em>Emf Ns URI</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YEnumListBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YEnumListBindingEndpointImpl.java
index 6fb86da..8684bea 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YEnumListBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YEnumListBindingEndpointImpl.java
@@ -24,10 +24,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YEnumListBindingEndpointImpl#getEnum <em>Enum</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YListBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YListBindingEndpointImpl.java
index 8662ad3..48b1770 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YListBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YListBindingEndpointImpl.java
@@ -19,8 +19,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>YList Binding Endpoint</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YListBindingImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YListBindingImpl.java
index 3c81225..682659f 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YListBindingImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YListBindingImpl.java
@@ -26,11 +26,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YListBindingImpl#getTargetEndpoint <em>Target Endpoint</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YListBindingImpl#getModelEndpoint <em>Model Endpoint</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YNoOpListBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YNoOpListBindingEndpointImpl.java
index 9a58d34..faeba8b 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YNoOpListBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YNoOpListBindingEndpointImpl.java
@@ -27,10 +27,10 @@
  * <em><b>YNo Op List Binding Endpoint</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YNoOpListBindingEndpointImpl#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YNoOpValueBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YNoOpValueBindingEndpointImpl.java
index affd406..6a5dc8f 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YNoOpValueBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YNoOpValueBindingEndpointImpl.java
@@ -27,10 +27,10 @@
  * <em><b>YNo Op Value Binding Endpoint</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YNoOpValueBindingEndpointImpl#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YValueBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YValueBindingEndpointImpl.java
index c0bf008..2a12330 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YValueBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YValueBindingEndpointImpl.java
@@ -20,8 +20,6 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
  * <em><b>YValue Binding Endpoint</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YValueBindingImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YValueBindingImpl.java
index af0d3e0..2a9ab13 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YValueBindingImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YValueBindingImpl.java
@@ -26,11 +26,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YValueBindingImpl#getTargetEndpoint <em>Target Endpoint</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YValueBindingImpl#getModelEndpoint <em>Model Endpoint</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YVisibilityProcessorValueBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YVisibilityProcessorValueBindingEndpointImpl.java
index 460ea2f..117b56c 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YVisibilityProcessorValueBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/impl/YVisibilityProcessorValueBindingEndpointImpl.java
@@ -24,11 +24,11 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YVisibilityProcessorValueBindingEndpointImpl#getProcessorInstance <em>Processor Instance</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.binding.impl.YVisibilityProcessorValueBindingEndpointImpl#getProperty <em>Property</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/util/BindingSwitch.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/util/BindingSwitch.java
index 2e2cb22..c7fac05 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/util/BindingSwitch.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/binding/util/BindingSwitch.java
@@ -70,7 +70,7 @@
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/CoreModelFactory.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/CoreModelFactory.java
index 31b3ac0..ed41703 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/CoreModelFactory.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/CoreModelFactory.java
@@ -246,6 +246,24 @@
 	YDelegateConverter createYDelegateConverter();
 
 	/**
+	 * Returns a new object of class '<em>YEmbeddable Event</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>YEmbeddable Event</em>'.
+	 * @generated
+	 */
+	YEmbeddableEvent createYEmbeddableEvent();
+
+	/**
+	 * Returns a new object of class '<em>YContext Click Event</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>YContext Click Event</em>'.
+	 * @generated
+	 */
+	YContextClickEvent createYContextClickEvent();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/CoreModelPackage.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/CoreModelPackage.java
index 8c4480b..471ec5e 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/CoreModelPackage.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/CoreModelPackage.java
@@ -342,13 +342,22 @@
 	int YEMBEDDABLE__LABEL_I1_8N_KEY = YELEMENT_FEATURE_COUNT + 11;
 
 	/**
+	 * The feature id for the '<em><b>Last Context Click</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YEMBEDDABLE__LAST_CONTEXT_CLICK = YELEMENT_FEATURE_COUNT + 12;
+
+	/**
 	 * The number of structural features of the '<em>YEmbeddable</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int YEMBEDDABLE_FEATURE_COUNT = YELEMENT_FEATURE_COUNT + 12;
+	int YEMBEDDABLE_FEATURE_COUNT = YELEMENT_FEATURE_COUNT + 13;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YLayoutImpl <em>YLayout</em>}' class.
@@ -505,6 +514,15 @@
 	int YLAYOUT__LABEL_I1_8N_KEY = YEMBEDDABLE__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 YLAYOUT__LAST_CONTEXT_CLICK = YEMBEDDABLE__LAST_CONTEXT_CLICK;
+
+	/**
 	 * The feature id for the '<em><b>Initial Editable</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -550,13 +568,31 @@
 	int YLAYOUT__ELEMENTS = YEMBEDDABLE_FEATURE_COUNT + 4;
 
 	/**
+	 * The feature id for the '<em><b>Last Component Attach</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YLAYOUT__LAST_COMPONENT_ATTACH = YEMBEDDABLE_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Last Component Detach</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YLAYOUT__LAST_COMPONENT_DETACH = YEMBEDDABLE_FEATURE_COUNT + 6;
+
+	/**
 	 * The number of structural features of the '<em>YLayout</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int YLAYOUT_FEATURE_COUNT = YEMBEDDABLE_FEATURE_COUNT + 5;
+	int YLAYOUT_FEATURE_COUNT = YEMBEDDABLE_FEATURE_COUNT + 7;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YHelperLayoutImpl <em>YHelper Layout</em>}' class.
@@ -882,6 +918,15 @@
 	int YHELPER_LAYOUT__LABEL_I1_8N_KEY = YLAYOUT__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 YHELPER_LAYOUT__LAST_CONTEXT_CLICK = YLAYOUT__LAST_CONTEXT_CLICK;
+
+	/**
 	 * The feature id for the '<em><b>Initial Editable</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -927,6 +972,24 @@
 	int YHELPER_LAYOUT__ELEMENTS = YLAYOUT__ELEMENTS;
 
 	/**
+	 * The feature id for the '<em><b>Last Component Attach</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YHELPER_LAYOUT__LAST_COMPONENT_ATTACH = YLAYOUT__LAST_COMPONENT_ATTACH;
+
+	/**
+	 * The feature id for the '<em><b>Last Component Detach</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YHELPER_LAYOUT__LAST_COMPONENT_DETACH = YLAYOUT__LAST_COMPONENT_DETACH;
+
+	/**
 	 * The feature id for the '<em><b>Virtual Elements</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1089,6 +1152,15 @@
 	int YFIELD__LABEL_I1_8N_KEY = YEMBEDDABLE__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 YFIELD__LAST_CONTEXT_CLICK = YEMBEDDABLE__LAST_CONTEXT_CLICK;
+
+	/**
 	 * The feature id for the '<em><b>Initial Editable</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1125,13 +1197,31 @@
 	int YFIELD__ENABLED = YEMBEDDABLE_FEATURE_COUNT + 3;
 
 	/**
+	 * The feature id for the '<em><b>Layout Idx</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YFIELD__LAYOUT_IDX = YEMBEDDABLE_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Layout Columns</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YFIELD__LAYOUT_COLUMNS = YEMBEDDABLE_FEATURE_COUNT + 5;
+
+	/**
 	 * The feature id for the '<em><b>Tab Index</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int YFIELD__TAB_INDEX = YEMBEDDABLE_FEATURE_COUNT + 4;
+	int YFIELD__TAB_INDEX = YEMBEDDABLE_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Validators</b></em>' containment reference list.
@@ -1140,7 +1230,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int YFIELD__VALIDATORS = YEMBEDDABLE_FEATURE_COUNT + 5;
+	int YFIELD__VALIDATORS = YEMBEDDABLE_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Internal Validators</b></em>' containment reference list.
@@ -1149,7 +1239,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int YFIELD__INTERNAL_VALIDATORS = YEMBEDDABLE_FEATURE_COUNT + 6;
+	int YFIELD__INTERNAL_VALIDATORS = YEMBEDDABLE_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
@@ -1158,7 +1248,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int YFIELD__CONVERTER = YEMBEDDABLE_FEATURE_COUNT + 7;
+	int YFIELD__CONVERTER = YEMBEDDABLE_FEATURE_COUNT + 9;
 
 	/**
 	 * The number of structural features of the '<em>YField</em>' class.
@@ -1167,7 +1257,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int YFIELD_FEATURE_COUNT = YEMBEDDABLE_FEATURE_COUNT + 8;
+	int YFIELD_FEATURE_COUNT = YEMBEDDABLE_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -2065,13 +2155,31 @@
 	int YFOCUSABLE = 22;
 
 	/**
+	 * The feature id for the '<em><b>Layout Idx</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YFOCUSABLE__LAYOUT_IDX = 0;
+
+	/**
+	 * The feature id for the '<em><b>Layout Columns</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YFOCUSABLE__LAYOUT_COLUMNS = 1;
+
+	/**
 	 * The feature id for the '<em><b>Tab Index</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int YFOCUSABLE__TAB_INDEX = 0;
+	int YFOCUSABLE__TAB_INDEX = 2;
 
 	/**
 	 * The number of structural features of the '<em>YFocusable</em>' class.
@@ -2080,7 +2188,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int YFOCUSABLE_FEATURE_COUNT = 1;
+	int YFOCUSABLE_FEATURE_COUNT = 3;
 
 	/**
 	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
@@ -2227,6 +2335,15 @@
 	int YACTION__LABEL_I1_8N_KEY = YEMBEDDABLE__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 YACTION__LAST_CONTEXT_CLICK = YEMBEDDABLE__LAST_CONTEXT_CLICK;
+
+	/**
 	 * The feature id for the '<em><b>Initial Enabled</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -3745,6 +3862,182 @@
 	int YAUTHORIZATIONABLE_FEATURE_COUNT = 2;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier <em>YFocus Notifier</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYFocusNotifier()
+	 * @generated
+	 */
+	int YFOCUS_NOTIFIER = 50;
+
+	/**
+	 * The feature id for the '<em><b>Last Focus Event</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YFOCUS_NOTIFIER__LAST_FOCUS_EVENT = 0;
+
+	/**
+	 * The number of structural features of the '<em>YFocus Notifier</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YFOCUS_NOTIFIER_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier <em>YBlur Notifier</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYBlurNotifier()
+	 * @generated
+	 */
+	int YBLUR_NOTIFIER = 51;
+
+	/**
+	 * The feature id for the '<em><b>Last Blur Event</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YBLUR_NOTIFIER__LAST_BLUR_EVENT = 0;
+
+	/**
+	 * The number of structural features of the '<em>YBlur Notifier</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YBLUR_NOTIFIER_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier <em>YText Change Notifier</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYTextChangeNotifier()
+	 * @generated
+	 */
+	int YTEXT_CHANGE_NOTIFIER = 52;
+
+	/**
+	 * The feature id for the '<em><b>Last Text Change</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YTEXT_CHANGE_NOTIFIER__LAST_TEXT_CHANGE = 0;
+
+	/**
+	 * The number of structural features of the '<em>YText Change Notifier</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YTEXT_CHANGE_NOTIFIER_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableEventImpl <em>YEmbeddable Event</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableEventImpl
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYEmbeddableEvent()
+	 * @generated
+	 */
+	int YEMBEDDABLE_EVENT = 53;
+
+	/**
+	 * The feature id for the '<em><b>Time</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YEMBEDDABLE_EVENT__TIME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Embeddable</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YEMBEDDABLE_EVENT__EMBEDDABLE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Raw Event</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YEMBEDDABLE_EVENT__RAW_EVENT = 2;
+
+	/**
+	 * The number of structural features of the '<em>YEmbeddable Event</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YEMBEDDABLE_EVENT_FEATURE_COUNT = 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YContextClickEventImpl <em>YContext Click Event</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.YContextClickEventImpl
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYContextClickEvent()
+	 * @generated
+	 */
+	int YCONTEXT_CLICK_EVENT = 54;
+
+	/**
+	 * The feature id for the '<em><b>Time</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YCONTEXT_CLICK_EVENT__TIME = YEMBEDDABLE_EVENT__TIME;
+
+	/**
+	 * The feature id for the '<em><b>Embeddable</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YCONTEXT_CLICK_EVENT__EMBEDDABLE = YEMBEDDABLE_EVENT__EMBEDDABLE;
+
+	/**
+	 * The feature id for the '<em><b>Raw Event</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YCONTEXT_CLICK_EVENT__RAW_EVENT = YEMBEDDABLE_EVENT__RAW_EVENT;
+
+	/**
+	 * The number of structural features of the '<em>YContext Click Event</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YCONTEXT_CLICK_EVENT_FEATURE_COUNT = YEMBEDDABLE_EVENT_FEATURE_COUNT + 0;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YDeviceType <em>YDevice Type</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -3752,7 +4045,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYDeviceType()
 	 * @generated
 	 */
-	int YDEVICE_TYPE = 50;
+	int YDEVICE_TYPE = 55;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YAlignment <em>YAlignment</em>}' enum.
@@ -3762,7 +4055,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYAlignment()
 	 * @generated
 	 */
-	int YALIGNMENT = 51;
+	int YALIGNMENT = 56;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YFlatAlignment <em>YFlat Alignment</em>}' enum.
@@ -3772,7 +4065,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYFlatAlignment()
 	 * @generated
 	 */
-	int YFLAT_ALIGNMENT = 52;
+	int YFLAT_ALIGNMENT = 57;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YUnit <em>YUnit</em>}' enum.
@@ -3782,7 +4075,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYUnit()
 	 * @generated
 	 */
-	int YUNIT = 53;
+	int YUNIT = 58;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YKeyCode <em>YKey Code</em>}' enum.
@@ -3792,7 +4085,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYKeyCode()
 	 * @generated
 	 */
-	int YKEY_CODE = 54;
+	int YKEY_CODE = 59;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YModifierKey <em>YModifier Key</em>}' enum.
@@ -3802,7 +4095,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYModifierKey()
 	 * @generated
 	 */
-	int YMODIFIER_KEY = 55;
+	int YMODIFIER_KEY = 60;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YOrientation <em>YOrientation</em>}' enum.
@@ -3812,7 +4105,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYOrientation()
 	 * @generated
 	 */
-	int YORIENTATION = 56;
+	int YORIENTATION = 61;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YCompare <em>YCompare</em>}' enum.
@@ -3822,7 +4115,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYCompare()
 	 * @generated
 	 */
-	int YCOMPARE = 57;
+	int YCOMPARE = 62;
 
 	/**
 	 * The meta object id for the '<em>YURI</em>' data type.
@@ -3832,7 +4125,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYURI()
 	 * @generated
 	 */
-	int YURI = 58;
+	int YURI = 63;
 
 
 	/**
@@ -3843,7 +4136,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYValueChangeListener()
 	 * @generated
 	 */
-	int YVALUE_CHANGE_LISTENER = 59;
+	int YVALUE_CHANGE_LISTENER = 64;
 
 
 	/**
@@ -3945,6 +4238,28 @@
 	EReference getYLayout_Elements();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.core.YLayout#getLastComponentAttach <em>Last Component Attach</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Last Component Attach</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YLayout#getLastComponentAttach()
+	 * @see #getYLayout()
+	 * @generated
+	 */
+	EAttribute getYLayout_LastComponentAttach();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.core.YLayout#getLastComponentDetach <em>Last Component Detach</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Last Component Detach</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YLayout#getLastComponentDetach()
+	 * @see #getYLayout()
+	 * @generated
+	 */
+	EAttribute getYLayout_LastComponentDetach();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.core.YHelperLayout <em>YHelper Layout</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4453,6 +4768,17 @@
 	EAttribute getYEmbeddable_LabelI18nKey();
 
 	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable#getLastContextClick <em>Last Context Click</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Last Context Click</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable#getLastContextClick()
+	 * @see #getYEmbeddable()
+	 * @generated
+	 */
+	EReference getYEmbeddable_LastContextClick();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.core.YDialog <em>YDialog</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4849,6 +5175,28 @@
 	EClass getYFocusable();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getLayoutIdx <em>Layout Idx</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Layout Idx</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getLayoutIdx()
+	 * @see #getYFocusable()
+	 * @generated
+	 */
+	EAttribute getYFocusable_LayoutIdx();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getLayoutColumns <em>Layout Columns</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Layout Columns</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getLayoutColumns()
+	 * @see #getYFocusable()
+	 * @generated
+	 */
+	EAttribute getYFocusable_LayoutColumns();
+
+	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getTabIndex <em>Tab Index</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -5570,6 +5918,122 @@
 	EAttribute getYTaggable_Tags();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier <em>YFocus Notifier</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>YFocus Notifier</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier
+	 * @generated
+	 */
+	EClass getYFocusNotifier();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier#getLastFocusEvent <em>Last Focus Event</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Last Focus Event</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier#getLastFocusEvent()
+	 * @see #getYFocusNotifier()
+	 * @generated
+	 */
+	EReference getYFocusNotifier_LastFocusEvent();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier <em>YBlur Notifier</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>YBlur Notifier</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier
+	 * @generated
+	 */
+	EClass getYBlurNotifier();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier#getLastBlurEvent <em>Last Blur Event</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Last Blur Event</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier#getLastBlurEvent()
+	 * @see #getYBlurNotifier()
+	 * @generated
+	 */
+	EReference getYBlurNotifier_LastBlurEvent();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier <em>YText Change Notifier</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>YText Change Notifier</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier
+	 * @generated
+	 */
+	EClass getYTextChangeNotifier();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier#getLastTextChange <em>Last Text Change</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Last Text Change</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier#getLastTextChange()
+	 * @see #getYTextChangeNotifier()
+	 * @generated
+	 */
+	EAttribute getYTextChangeNotifier_LastTextChange();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent <em>YEmbeddable Event</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>YEmbeddable Event</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent
+	 * @generated
+	 */
+	EClass getYEmbeddableEvent();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent#getTime <em>Time</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Time</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent#getTime()
+	 * @see #getYEmbeddableEvent()
+	 * @generated
+	 */
+	EAttribute getYEmbeddableEvent_Time();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent#getEmbeddable <em>Embeddable</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Embeddable</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent#getEmbeddable()
+	 * @see #getYEmbeddableEvent()
+	 * @generated
+	 */
+	EReference getYEmbeddableEvent_Embeddable();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent#getRawEvent <em>Raw Event</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Raw Event</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent#getRawEvent()
+	 * @see #getYEmbeddableEvent()
+	 * @generated
+	 */
+	EAttribute getYEmbeddableEvent_RawEvent();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.core.YContextClickEvent <em>YContext Click Event</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>YContext Click Event</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.YContextClickEvent
+	 * @generated
+	 */
+	EClass getYContextClickEvent();
+
+	/**
 	 * Returns the meta object for enum '{@link org.eclipse.osbp.ecview.core.common.model.core.YDeviceType <em>YDevice Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -5772,6 +6236,22 @@
 		EReference YLAYOUT__ELEMENTS = eINSTANCE.getYLayout_Elements();
 
 		/**
+		 * The meta object literal for the '<em><b>Last Component Attach</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YLAYOUT__LAST_COMPONENT_ATTACH = eINSTANCE.getYLayout_LastComponentAttach();
+
+		/**
+		 * The meta object literal for the '<em><b>Last Component Detach</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YLAYOUT__LAST_COMPONENT_DETACH = eINSTANCE.getYLayout_LastComponentDetach();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YHelperLayoutImpl <em>YHelper Layout</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -6166,6 +6646,14 @@
 		EAttribute YEMBEDDABLE__LABEL_I1_8N_KEY = eINSTANCE.getYEmbeddable_LabelI18nKey();
 
 		/**
+		 * The meta object literal for the '<em><b>Last Context Click</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference YEMBEDDABLE__LAST_CONTEXT_CLICK = eINSTANCE.getYEmbeddable_LastContextClick();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDialogImpl <em>YDialog</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -6484,6 +6972,22 @@
 		EClass YFOCUSABLE = eINSTANCE.getYFocusable();
 
 		/**
+		 * The meta object literal for the '<em><b>Layout Idx</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YFOCUSABLE__LAYOUT_IDX = eINSTANCE.getYFocusable_LayoutIdx();
+
+		/**
+		 * The meta object literal for the '<em><b>Layout Columns</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YFOCUSABLE__LAYOUT_COLUMNS = eINSTANCE.getYFocusable_LayoutColumns();
+
+		/**
 		 * The meta object literal for the '<em><b>Tab Index</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -7082,6 +7586,104 @@
 		EAttribute YTAGGABLE__TAGS = eINSTANCE.getYTaggable_Tags();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier <em>YFocus Notifier</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYFocusNotifier()
+		 * @generated
+		 */
+		EClass YFOCUS_NOTIFIER = eINSTANCE.getYFocusNotifier();
+
+		/**
+		 * The meta object literal for the '<em><b>Last Focus Event</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference YFOCUS_NOTIFIER__LAST_FOCUS_EVENT = eINSTANCE.getYFocusNotifier_LastFocusEvent();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier <em>YBlur Notifier</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYBlurNotifier()
+		 * @generated
+		 */
+		EClass YBLUR_NOTIFIER = eINSTANCE.getYBlurNotifier();
+
+		/**
+		 * The meta object literal for the '<em><b>Last Blur Event</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference YBLUR_NOTIFIER__LAST_BLUR_EVENT = eINSTANCE.getYBlurNotifier_LastBlurEvent();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier <em>YText Change Notifier</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYTextChangeNotifier()
+		 * @generated
+		 */
+		EClass YTEXT_CHANGE_NOTIFIER = eINSTANCE.getYTextChangeNotifier();
+
+		/**
+		 * The meta object literal for the '<em><b>Last Text Change</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YTEXT_CHANGE_NOTIFIER__LAST_TEXT_CHANGE = eINSTANCE.getYTextChangeNotifier_LastTextChange();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableEventImpl <em>YEmbeddable Event</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableEventImpl
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYEmbeddableEvent()
+		 * @generated
+		 */
+		EClass YEMBEDDABLE_EVENT = eINSTANCE.getYEmbeddableEvent();
+
+		/**
+		 * The meta object literal for the '<em><b>Time</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YEMBEDDABLE_EVENT__TIME = eINSTANCE.getYEmbeddableEvent_Time();
+
+		/**
+		 * The meta object literal for the '<em><b>Embeddable</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference YEMBEDDABLE_EVENT__EMBEDDABLE = eINSTANCE.getYEmbeddableEvent_Embeddable();
+
+		/**
+		 * The meta object literal for the '<em><b>Raw Event</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YEMBEDDABLE_EVENT__RAW_EVENT = eINSTANCE.getYEmbeddableEvent_RawEvent();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YContextClickEventImpl <em>YContext Click Event</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.YContextClickEventImpl
+		 * @see org.eclipse.osbp.ecview.core.common.model.core.impl.CoreModelPackageImpl#getYContextClickEvent()
+		 * @generated
+		 */
+		EClass YCONTEXT_CLICK_EVENT = eINSTANCE.getYContextClickEvent();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.core.YDeviceType <em>YDevice Type</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YActivateable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YActivateable.java
index 7b589a7..c424fef 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YActivateable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YActivateable.java
@@ -18,11 +18,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YActivateable#isInitialActivated <em>Initial Activated</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YActivateable#isActivated <em>Activated</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYActivateable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YActivatedEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YActivatedEndpoint.java
index 033473a..a55d521 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YActivatedEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YActivatedEndpoint.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YActivatedEndpoint#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYActivatedEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YAlignment.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YAlignment.java
index c17cc5f..1dc498c 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YAlignment.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YAlignment.java
@@ -490,6 +490,8 @@
 	/**
 	 * Returns the '<em><b>YAlignment</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YAlignment get(String literal) {
@@ -505,6 +507,8 @@
 	/**
 	 * Returns the '<em><b>YAlignment</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YAlignment getByName(String name) {
@@ -520,6 +524,8 @@
 	/**
 	 * Returns the '<em><b>YAlignment</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YAlignment get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YAuthorizationable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YAuthorizationable.java
index 950d95a..f0d6e25 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YAuthorizationable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YAuthorizationable.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YAuthorizationable#getAuthorizationGroup <em>Authorization Group</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YAuthorizationable#getAuthorizationId <em>Authorization Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYAuthorizationable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlot.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlot.java
index 84da744..87511cf 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlot.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlot.java
@@ -20,6 +20,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlot#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlot#getValueType <em>Value Type</em>}</li>
@@ -27,7 +28,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlot#getEventTopic <em>Event Topic</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlot#isRedirectEvents <em>Redirect Events</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYBeanSlot()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlotListBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlotListBindingEndpoint.java
index 3ec0a0c..f70d8af 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlotListBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlotListBindingEndpoint.java
@@ -19,13 +19,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlotListBindingEndpoint#getAttributePath <em>Attribute Path</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlotListBindingEndpoint#getBeanSlot <em>Bean Slot</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlotListBindingEndpoint#getCollectionType <em>Collection Type</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlotListBindingEndpoint#getCollectionTypeQualifiedName <em>Collection Type Qualified Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYBeanSlotListBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlotValueBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlotValueBindingEndpoint.java
index acadc6b..a091124 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlotValueBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YBeanSlotValueBindingEndpoint.java
@@ -19,11 +19,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlotValueBindingEndpoint#getAttributePath <em>Attribute Path</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YBeanSlotValueBindingEndpoint#getBeanSlot <em>Bean Slot</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYBeanSlotValueBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCollectionBindable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCollectionBindable.java
index 07d58a7..d396ce6 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCollectionBindable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCollectionBindable.java
@@ -19,10 +19,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YCollectionBindable#getCollectionBindingEndpoint <em>Collection Binding Endpoint</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYCollectionBindable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCommandSet.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCommandSet.java
index 937ee38..a1e986c 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCommandSet.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCommandSet.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YCommandSet#getCommands <em>Commands</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YCommandSet#getTransientCommands <em>Transient Commands</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYCommandSet()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCompare.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCompare.java
index e1af22e..69c7eac 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCompare.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCompare.java
@@ -204,6 +204,8 @@
 	/**
 	 * Returns the '<em><b>YCompare</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YCompare get(String literal) {
@@ -219,6 +221,8 @@
 	/**
 	 * Returns the '<em><b>YCompare</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YCompare getByName(String name) {
@@ -234,6 +238,8 @@
 	/**
 	 * Returns the '<em><b>YCompare</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YCompare get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YContextValueBindingEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YContextValueBindingEndpoint.java
index 027d671..517b232 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YContextValueBindingEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YContextValueBindingEndpoint.java
@@ -19,10 +19,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YContextValueBindingEndpoint#getUrlString <em>Url String</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYContextValueBindingEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCssAble.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCssAble.java
index e562a48..3dbf79c 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCssAble.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YCssAble.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YCssAble#getCssClass <em>Css Class</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YCssAble#getCssID <em>Css ID</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYCssAble()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDelegateConverter.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDelegateConverter.java
index a76601e..7076885 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDelegateConverter.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDelegateConverter.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YDelegateConverter#getConverterId <em>Converter Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYDelegateConverter()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDetailBeanSlot.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDetailBeanSlot.java
index 8b3047c..ff4b0a3 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDetailBeanSlot.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDetailBeanSlot.java
@@ -21,11 +21,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YDetailBeanSlot#getMasterBeanSlot <em>Master Bean Slot</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YDetailBeanSlot#getPropertyPath <em>Property Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYDetailBeanSlot()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDeviceType.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDeviceType.java
index d28388c..6ef8d86 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDeviceType.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDeviceType.java
@@ -100,6 +100,8 @@
 	/**
 	 * Returns the '<em><b>YDevice Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YDeviceType get(String literal) {
@@ -115,6 +117,8 @@
 	/**
 	 * Returns the '<em><b>YDevice Type</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YDeviceType getByName(String name) {
@@ -130,6 +134,8 @@
 	/**
 	 * Returns the '<em><b>YDevice Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YDeviceType get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDialog.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDialog.java
index 936c036..9c41435 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDialog.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YDialog.java
@@ -19,6 +19,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YDialog#getContent <em>Content</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YDialog#isModal <em>Modal</em>}</li>
@@ -31,7 +32,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YDialog#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YDialog#getDatadescription <em>Datadescription</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYDialog()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEditable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEditable.java
index 41044fb..c7ae935 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEditable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEditable.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEditable#isInitialEditable <em>Initial Editable</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEditable#isEditable <em>Editable</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYEditable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YElement.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YElement.java
index 1d9d2b1..56c9e7e 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YElement.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YElement.java
@@ -20,12 +20,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YElement#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YElement#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YElement#getProperties <em>Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYElement()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddable.java
index f5e6971..28da3eb 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddable.java
@@ -22,6 +22,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable#getOrphanDatatypes <em>Orphan Datatypes</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable#getOrphanDatadescriptions <em>Orphan Datadescriptions</em>}</li>
@@ -29,8 +30,8 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable#getMementoId <em>Memento Id</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable#getLabel <em>Label</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable#getLabelI18nKey <em>Label I1 8n Key</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable#getLastContextClick <em>Last Context Click</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYEmbeddable()
  * @model abstract="true"
@@ -180,6 +181,32 @@
 	void setLabelI18nKey(String value);
 
 	/**
+	 * Returns the value of the '<em><b>Last Context Click</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Context Click</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Context Click</em>' reference.
+	 * @see #setLastContextClick(YContextClickEvent)
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYEmbeddable_LastContextClick()
+	 * @model transient="true"
+	 * @generated
+	 */
+	YContextClickEvent getLastContextClick();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable#getLastContextClick <em>Last Context Click</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Context Click</em>' reference.
+	 * @see #getLastContextClick()
+	 * @generated
+	 */
+	void setLastContextClick(YContextClickEvent value);
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @return the view
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableCollectionEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableCollectionEndpoint.java
index ddac182..beed0e3 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableCollectionEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableCollectionEndpoint.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableCollectionEndpoint#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYEmbeddableCollectionEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableMultiSelectionEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableMultiSelectionEndpoint.java
index 9985d49..0d4e127 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableMultiSelectionEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableMultiSelectionEndpoint.java
@@ -19,10 +19,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableMultiSelectionEndpoint#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYEmbeddableMultiSelectionEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableSelectionEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableSelectionEndpoint.java
index 3daa854..95dec91 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableSelectionEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableSelectionEndpoint.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableSelectionEndpoint#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableSelectionEndpoint#getAttributePath <em>Attribute Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYEmbeddableSelectionEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableValueEndpoint.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableValueEndpoint.java
index 87f5d90..6e0bce1 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableValueEndpoint.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEmbeddableValueEndpoint.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableValueEndpoint#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYEmbeddableValueEndpoint()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEnable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEnable.java
index 44175fe..b8d11b6 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEnable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YEnable.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEnable#isInitialEnabled <em>Initial Enabled</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YEnable#isEnabled <em>Enabled</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYEnable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YExposedAction.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YExposedAction.java
index 0f5a489..4dbdc84 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YExposedAction.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YExposedAction.java
@@ -19,6 +19,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YExposedAction#getIcon <em>Icon</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YExposedAction#getLabel <em>Label</em>}</li>
@@ -30,7 +31,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YExposedAction#isCheckDirty <em>Check Dirty</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YExposedAction#getExternalCommandId <em>External Command Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYExposedAction()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YField.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YField.java
index e811cc6..d1638d4 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YField.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YField.java
@@ -24,12 +24,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YField#getValidators <em>Validators</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YField#getInternalValidators <em>Internal Validators</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YField#getConverter <em>Converter</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYField()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YFlatAlignment.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YFlatAlignment.java
index 9ce17b4..05ce266 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YFlatAlignment.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YFlatAlignment.java
@@ -126,6 +126,8 @@
 	/**
 	 * Returns the '<em><b>YFlat Alignment</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YFlatAlignment get(String literal) {
@@ -141,6 +143,8 @@
 	/**
 	 * Returns the '<em><b>YFlat Alignment</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YFlatAlignment getByName(String name) {
@@ -156,6 +160,8 @@
 	/**
 	 * Returns the '<em><b>YFlat Alignment</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YFlatAlignment get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YFocusable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YFocusable.java
index e4ac8ac..509910c 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YFocusable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YFocusable.java
@@ -19,10 +19,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getLayoutIdx <em>Layout Idx</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getLayoutColumns <em>Layout Columns</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getTabIndex <em>Tab Index</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYFocusable()
  * @model interface="true" abstract="true"
@@ -30,6 +32,58 @@
  */
 public interface YFocusable extends EObject {
 	/**
+	 * Returns the value of the '<em><b>Layout Idx</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Layout Idx</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Layout Idx</em>' attribute.
+	 * @see #setLayoutIdx(int)
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYFocusable_LayoutIdx()
+	 * @model
+	 * @generated
+	 */
+	int getLayoutIdx();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getLayoutIdx <em>Layout Idx</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Layout Idx</em>' attribute.
+	 * @see #getLayoutIdx()
+	 * @generated
+	 */
+	void setLayoutIdx(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Layout Columns</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Layout Columns</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Layout Columns</em>' attribute.
+	 * @see #setLayoutColumns(int)
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYFocusable_LayoutColumns()
+	 * @model
+	 * @generated
+	 */
+	int getLayoutColumns();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusable#getLayoutColumns <em>Layout Columns</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Layout Columns</em>' attribute.
+	 * @see #getLayoutColumns()
+	 * @generated
+	 */
+	void setLayoutColumns(int value);
+
+	/**
 	 * Returns the value of the '<em><b>Tab Index</b></em>' attribute.
 	 * The default value is <code>"-1"</code>.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YHeightable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YHeightable.java
index 8827e6d..4e81040 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YHeightable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YHeightable.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YHeightable#getHeight <em>Height</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YHeightable#getHeightUnit <em>Height Unit</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYHeightable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YHelperLayout.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YHelperLayout.java
index b2d523d..7a9fa74 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YHelperLayout.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YHelperLayout.java
@@ -32,10 +32,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YHelperLayout#getVirtualElements <em>Virtual Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYHelperLayout()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YKeyCode.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YKeyCode.java
index dd8359c..612a433 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YKeyCode.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YKeyCode.java
@@ -1686,6 +1686,8 @@
 	/**
 	 * Returns the '<em><b>YKey Code</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YKeyCode get(String literal) {
@@ -1701,6 +1703,8 @@
 	/**
 	 * Returns the '<em><b>YKey Code</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YKeyCode getByName(String name) {
@@ -1716,6 +1720,8 @@
 	/**
 	 * Returns the '<em><b>YKey Code</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YKeyCode get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YKeyStrokeDefinition.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YKeyStrokeDefinition.java
index 73f30ec..d20933c 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YKeyStrokeDefinition.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YKeyStrokeDefinition.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YKeyStrokeDefinition#getKeyCode <em>Key Code</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YKeyStrokeDefinition#getModifierKeys <em>Modifier Keys</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYKeyStrokeDefinition()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YLayout.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YLayout.java
index 12c89eb..ae044ba 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YLayout.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YLayout.java
@@ -19,10 +19,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YLayout#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YLayout#getLastComponentAttach <em>Last Component Attach</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YLayout#getLastComponentDetach <em>Last Component Detach</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYLayout()
  * @model
@@ -48,6 +50,58 @@
 	EList<YEmbeddable> getElements();
 
 	/**
+	 * Returns the value of the '<em><b>Last Component Attach</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Component Attach</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Component Attach</em>' attribute.
+	 * @see #setLastComponentAttach(Object)
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYLayout_LastComponentAttach()
+	 * @model transient="true"
+	 * @generated
+	 */
+	Object getLastComponentAttach();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.core.common.model.core.YLayout#getLastComponentAttach <em>Last Component Attach</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Component Attach</em>' attribute.
+	 * @see #getLastComponentAttach()
+	 * @generated
+	 */
+	void setLastComponentAttach(Object value);
+
+	/**
+	 * Returns the value of the '<em><b>Last Component Detach</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Component Detach</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Component Detach</em>' attribute.
+	 * @see #setLastComponentDetach(Object)
+	 * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYLayout_LastComponentDetach()
+	 * @model transient="true"
+	 * @generated
+	 */
+	Object getLastComponentDetach();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.osbp.ecview.core.common.model.core.YLayout#getLastComponentDetach <em>Last Component Detach</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Component Detach</em>' attribute.
+	 * @see #getLastComponentDetach()
+	 * @generated
+	 */
+	void setLastComponentDetach(Object value);
+
+	/**
 	 * Adds the given element to the list of elements.
 	 *
 	 * @param element
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YMarginable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YMarginable.java
index 7e5743b..d6c933e 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YMarginable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YMarginable.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YMarginable#isMargin <em>Margin</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYMarginable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YModifierKey.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YModifierKey.java
index 91c04ba..de595e2 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YModifierKey.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YModifierKey.java
@@ -151,6 +151,8 @@
 	/**
 	 * Returns the '<em><b>YModifier Key</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YModifierKey get(String literal) {
@@ -166,6 +168,8 @@
 	/**
 	 * Returns the '<em><b>YModifier Key</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YModifierKey getByName(String name) {
@@ -181,6 +185,8 @@
 	/**
 	 * Returns the '<em><b>YModifier Key</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YModifierKey get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YMultiSelectionBindable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YMultiSelectionBindable.java
index 6ed39d0..e531680 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YMultiSelectionBindable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YMultiSelectionBindable.java
@@ -19,10 +19,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YMultiSelectionBindable#getMultiSelectionBindingEndpoint <em>Multi Selection Binding Endpoint</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYMultiSelectionBindable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YOpenDialogCommand.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YOpenDialogCommand.java
index 541a734..480d43d 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YOpenDialogCommand.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YOpenDialogCommand.java
@@ -21,11 +21,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YOpenDialogCommand#getDialog <em>Dialog</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YOpenDialogCommand#getTrigger <em>Trigger</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYOpenDialogCommand()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YOrientation.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YOrientation.java
index bf8b71d..be0ab96 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YOrientation.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YOrientation.java
@@ -103,6 +103,8 @@
 	/**
 	 * Returns the '<em><b>YOrientation</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YOrientation get(String literal) {
@@ -118,6 +120,8 @@
 	/**
 	 * Returns the '<em><b>YOrientation</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YOrientation getByName(String name) {
@@ -133,6 +137,8 @@
 	/**
 	 * Returns the '<em><b>YOrientation</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YOrientation get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSelectionBindable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSelectionBindable.java
index 8e8adc7..e572a17 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSelectionBindable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSelectionBindable.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YSelectionBindable#getSelectionBindingEndpoint <em>Selection Binding Endpoint</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYSelectionBindable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSendEventCommand.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSendEventCommand.java
index 5e86f30..b28d9f2 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSendEventCommand.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSendEventCommand.java
@@ -20,13 +20,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YSendEventCommand#getEventTopic <em>Event Topic</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YSendEventCommand#getMessage <em>Message</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YSendEventCommand#getTrigger <em>Trigger</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YSendEventCommand#isAutoTrigger <em>Auto Trigger</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYSendEventCommand()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSpacingable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSpacingable.java
index 31b7138..1043591 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSpacingable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YSpacingable.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YSpacingable#isSpacing <em>Spacing</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYSpacingable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YTaggable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YTaggable.java
index c88205e..c8bb2e4 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YTaggable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YTaggable.java
@@ -24,10 +24,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YTaggable#getTags <em>Tags</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYTaggable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YUnit.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YUnit.java
index 657dc9d..c69d9cb 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YUnit.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YUnit.java
@@ -100,6 +100,8 @@
 	/**
 	 * Returns the '<em><b>YUnit</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YUnit get(String literal) {
@@ -134,6 +136,8 @@
 	/**
 	 * Returns the '<em><b>YUnit</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YUnit get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YValueBindable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YValueBindable.java
index e301028..eae5542 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YValueBindable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YValueBindable.java
@@ -19,10 +19,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YValueBindable#getValueBindingEndpoint <em>Value Binding Endpoint</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYValueBindable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YView.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YView.java
index bbbb403..c0b4455 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YView.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YView.java
@@ -22,6 +22,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YView#getRoot <em>Root</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YView#getViewName <em>View Name</em>}</li>
@@ -43,7 +44,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YView#getDisabledElements <em>Disabled Elements</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YView#getAuthorizationStore <em>Authorization Store</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYView()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YViewSet.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YViewSet.java
index 4bf0529..1fc5c85 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YViewSet.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YViewSet.java
@@ -18,11 +18,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YViewSet#getViews <em>Views</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YViewSet#getBeanSlots <em>Bean Slots</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYViewSet()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YVisibleable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YVisibleable.java
index 66b321d..dc82c3d 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YVisibleable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YVisibleable.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YVisibleable#isInitialVisible <em>Initial Visible</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YVisibleable#isVisible <em>Visible</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYVisibleable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YWidthable.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YWidthable.java
index 70f867c..a653b22 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YWidthable.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/YWidthable.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YWidthable#getWidth <em>Width</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.YWidthable#getWidthUnit <em>Width Unit</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage#getYWidthable()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/YAuthorizationStore.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/YAuthorizationStore.java
index b2c92cf..0026758 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/YAuthorizationStore.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/YAuthorizationStore.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.authorization.YAuthorizationStore#getAuthorizations <em>Authorizations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.authorization.AuthorizationPackage#getYAuthorizationStore()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/YFieldAuthorization.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/YFieldAuthorization.java
index 748e670..b21864c 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/YFieldAuthorization.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/YFieldAuthorization.java
@@ -24,12 +24,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.authorization.YFieldAuthorization#getTarget <em>Target</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.authorization.YFieldAuthorization#getRoles <em>Roles</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.authorization.YFieldAuthorization#getActions <em>Actions</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.core.authorization.AuthorizationPackage#getYFieldAuthorization()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/impl/YAuthorizationStoreImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/impl/YAuthorizationStoreImpl.java
index 6036284..d46cb18 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/impl/YAuthorizationStoreImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/impl/YAuthorizationStoreImpl.java
@@ -32,10 +32,10 @@
  * <em><b>YAuthorization Store</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.authorization.impl.YAuthorizationStoreImpl#getAuthorizations <em>Authorizations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/impl/YFieldAuthorizationImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/impl/YFieldAuthorizationImpl.java
index 435916e..e8db828 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/impl/YFieldAuthorizationImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/authorization/impl/YFieldAuthorizationImpl.java
@@ -31,12 +31,12 @@
  * <em><b>YField Authorization</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.authorization.impl.YFieldAuthorizationImpl#getTarget <em>Target</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.authorization.impl.YFieldAuthorizationImpl#getRoles <em>Roles</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.authorization.impl.YFieldAuthorizationImpl#getActions <em>Actions</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/CoreModelFactoryImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/CoreModelFactoryImpl.java
index 5f10cc0..d80768b 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/CoreModelFactoryImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/CoreModelFactoryImpl.java
@@ -124,6 +124,8 @@
 			case CoreModelPackage.YSEND_EVENT_COMMAND: return createYSendEventCommand();
 			case CoreModelPackage.YKEY_STROKE_DEFINITION: return createYKeyStrokeDefinition();
 			case CoreModelPackage.YDELEGATE_CONVERTER: return createYDelegateConverter();
+			case CoreModelPackage.YEMBEDDABLE_EVENT: return createYEmbeddableEvent();
+			case CoreModelPackage.YCONTEXT_CLICK_EVENT: return createYContextClickEvent();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -480,6 +482,26 @@
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YEmbeddableEvent createYEmbeddableEvent() {
+		YEmbeddableEventImpl yEmbeddableEvent = new YEmbeddableEventImpl();
+		return yEmbeddableEvent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YContextClickEvent createYContextClickEvent() {
+		YContextClickEventImpl yContextClickEvent = new YContextClickEventImpl();
+		return yContextClickEvent;
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->.
 	 *
 	 * @param eDataType
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/CoreModelPackageImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/CoreModelPackageImpl.java
index 5c65dc1..c642502 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/CoreModelPackageImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/CoreModelPackageImpl.java
@@ -38,10 +38,12 @@
 import org.eclipse.osbp.ecview.core.common.model.core.YBeanSlotListBindingEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.YBeanSlotValueBindingEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.YBindable;
+import org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier;
 import org.eclipse.osbp.ecview.core.common.model.core.YCollectionBindable;
 import org.eclipse.osbp.ecview.core.common.model.core.YCommand;
 import org.eclipse.osbp.ecview.core.common.model.core.YCommandSet;
 import org.eclipse.osbp.ecview.core.common.model.core.YCompare;
+import org.eclipse.osbp.ecview.core.common.model.core.YContextClickEvent;
 import org.eclipse.osbp.ecview.core.common.model.core.YContextValueBindingEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.YConverter;
 import org.eclipse.osbp.ecview.core.common.model.core.YCssAble;
@@ -55,6 +57,7 @@
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableBindingEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableCollectionEndpoint;
+import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableMultiSelectionEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableSelectionEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableValueEndpoint;
@@ -62,6 +65,7 @@
 import org.eclipse.osbp.ecview.core.common.model.core.YExposedAction;
 import org.eclipse.osbp.ecview.core.common.model.core.YField;
 import org.eclipse.osbp.ecview.core.common.model.core.YFlatAlignment;
+import org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier;
 import org.eclipse.osbp.ecview.core.common.model.core.YFocusable;
 import org.eclipse.osbp.ecview.core.common.model.core.YHeightable;
 import org.eclipse.osbp.ecview.core.common.model.core.YHelperLayout;
@@ -79,6 +83,7 @@
 import org.eclipse.osbp.ecview.core.common.model.core.YSendEventCommand;
 import org.eclipse.osbp.ecview.core.common.model.core.YSpacingable;
 import org.eclipse.osbp.ecview.core.common.model.core.YTaggable;
+import org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier;
 import org.eclipse.osbp.ecview.core.common.model.core.YUnit;
 import org.eclipse.osbp.ecview.core.common.model.core.YValueBindable;
 import org.eclipse.osbp.ecview.core.common.model.core.YView;
@@ -457,6 +462,41 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass yFocusNotifierEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass yBlurNotifierEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass yTextChangeNotifierEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass yEmbeddableEventEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass yContextClickEventEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EEnum yDeviceTypeEEnum = null;
 
 	/**
@@ -686,6 +726,24 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getYLayout_LastComponentAttach() {
+		return (EAttribute)yLayoutEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYLayout_LastComponentDetach() {
+		return (EAttribute)yLayoutEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getYHelperLayout() {
 		return yHelperLayoutEClass;
 	}
@@ -1109,6 +1167,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getYEmbeddable_LastContextClick() {
+		return (EReference)yEmbeddableEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getYDialog() {
 		return yDialogEClass;
 	}
@@ -1442,7 +1509,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getYFocusable_TabIndex() {
+	public EAttribute getYFocusable_LayoutIdx() {
 		return (EAttribute)yFocusableEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -1451,6 +1518,24 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getYFocusable_LayoutColumns() {
+		return (EAttribute)yFocusableEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYFocusable_TabIndex() {
+		return (EAttribute)yFocusableEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getYAction() {
 		return yActionEClass;
 	}
@@ -2054,6 +2139,105 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getYFocusNotifier() {
+		return yFocusNotifierEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getYFocusNotifier_LastFocusEvent() {
+		return (EReference)yFocusNotifierEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getYBlurNotifier() {
+		return yBlurNotifierEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getYBlurNotifier_LastBlurEvent() {
+		return (EReference)yBlurNotifierEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getYTextChangeNotifier() {
+		return yTextChangeNotifierEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYTextChangeNotifier_LastTextChange() {
+		return (EAttribute)yTextChangeNotifierEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getYEmbeddableEvent() {
+		return yEmbeddableEventEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYEmbeddableEvent_Time() {
+		return (EAttribute)yEmbeddableEventEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getYEmbeddableEvent_Embeddable() {
+		return (EReference)yEmbeddableEventEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYEmbeddableEvent_RawEvent() {
+		return (EAttribute)yEmbeddableEventEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getYContextClickEvent() {
+		return yContextClickEventEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EEnum getYDeviceType() {
 		return yDeviceTypeEEnum;
 	}
@@ -2178,6 +2362,8 @@
 
 		yLayoutEClass = createEClass(YLAYOUT);
 		createEReference(yLayoutEClass, YLAYOUT__ELEMENTS);
+		createEAttribute(yLayoutEClass, YLAYOUT__LAST_COMPONENT_ATTACH);
+		createEAttribute(yLayoutEClass, YLAYOUT__LAST_COMPONENT_DETACH);
 
 		yHelperLayoutProviderEClass = createEClass(YHELPER_LAYOUT_PROVIDER);
 
@@ -2234,6 +2420,7 @@
 		createEAttribute(yEmbeddableEClass, YEMBEDDABLE__MEMENTO_ID);
 		createEAttribute(yEmbeddableEClass, YEMBEDDABLE__LABEL);
 		createEAttribute(yEmbeddableEClass, YEMBEDDABLE__LABEL_I1_8N_KEY);
+		createEReference(yEmbeddableEClass, YEMBEDDABLE__LAST_CONTEXT_CLICK);
 
 		yDialogEClass = createEClass(YDIALOG);
 		createEReference(yDialogEClass, YDIALOG__CONTENT);
@@ -2282,6 +2469,8 @@
 		createEAttribute(yEnableEClass, YENABLE__ENABLED);
 
 		yFocusableEClass = createEClass(YFOCUSABLE);
+		createEAttribute(yFocusableEClass, YFOCUSABLE__LAYOUT_IDX);
+		createEAttribute(yFocusableEClass, YFOCUSABLE__LAYOUT_COLUMNS);
 		createEAttribute(yFocusableEClass, YFOCUSABLE__TAB_INDEX);
 
 		yActionEClass = createEClass(YACTION);
@@ -2378,6 +2567,22 @@
 		yTaggableEClass = createEClass(YTAGGABLE);
 		createEAttribute(yTaggableEClass, YTAGGABLE__TAGS);
 
+		yFocusNotifierEClass = createEClass(YFOCUS_NOTIFIER);
+		createEReference(yFocusNotifierEClass, YFOCUS_NOTIFIER__LAST_FOCUS_EVENT);
+
+		yBlurNotifierEClass = createEClass(YBLUR_NOTIFIER);
+		createEReference(yBlurNotifierEClass, YBLUR_NOTIFIER__LAST_BLUR_EVENT);
+
+		yTextChangeNotifierEClass = createEClass(YTEXT_CHANGE_NOTIFIER);
+		createEAttribute(yTextChangeNotifierEClass, YTEXT_CHANGE_NOTIFIER__LAST_TEXT_CHANGE);
+
+		yEmbeddableEventEClass = createEClass(YEMBEDDABLE_EVENT);
+		createEAttribute(yEmbeddableEventEClass, YEMBEDDABLE_EVENT__TIME);
+		createEReference(yEmbeddableEventEClass, YEMBEDDABLE_EVENT__EMBEDDABLE);
+		createEAttribute(yEmbeddableEventEClass, YEMBEDDABLE_EVENT__RAW_EVENT);
+
+		yContextClickEventEClass = createEClass(YCONTEXT_CLICK_EVENT);
+
 		// Create enums
 		yDeviceTypeEEnum = createEEnum(YDEVICE_TYPE);
 		yAlignmentEEnum = createEEnum(YALIGNMENT);
@@ -2486,6 +2691,7 @@
 		yConverterEClass.getESuperTypes().add(this.getYElement());
 		yDelegateConverterEClass.getESuperTypes().add(this.getYConverter());
 		yMementoEClass.getESuperTypes().add(this.getYElement());
+		yContextClickEventEClass.getESuperTypes().add(this.getYEmbeddableEvent());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(yElementEClass, YElement.class, "YElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2499,6 +2705,8 @@
 
 		initEClass(yLayoutEClass, YLayout.class, "YLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getYLayout_Elements(), this.getYEmbeddable(), null, "elements", null, 0, -1, YLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYLayout_LastComponentAttach(), ecorePackage.getEJavaObject(), "lastComponentAttach", null, 0, 1, YLayout.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYLayout_LastComponentDetach(), ecorePackage.getEJavaObject(), "lastComponentDetach", null, 0, 1, YLayout.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(yHelperLayoutProviderEClass, YHelperLayoutProvider.class, "YHelperLayoutProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
@@ -2574,6 +2782,7 @@
 		initEAttribute(getYEmbeddable_MementoId(), ecorePackage.getEString(), "mementoId", "", 0, 1, YEmbeddable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getYEmbeddable_Label(), ecorePackage.getEString(), "label", null, 0, 1, YEmbeddable.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEAttribute(getYEmbeddable_LabelI18nKey(), ecorePackage.getEString(), "labelI18nKey", null, 0, 1, YEmbeddable.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getYEmbeddable_LastContextClick(), this.getYContextClickEvent(), null, "lastContextClick", null, 0, 1, YEmbeddable.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		addEOperation(yEmbeddableEClass, this.getYView(), "getView", 0, 1, IS_UNIQUE, IS_ORDERED);
 
@@ -2629,6 +2838,8 @@
 		initEAttribute(getYEnable_Enabled(), ecorePackage.getEBoolean(), "enabled", "true", 0, 1, YEnable.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
 		initEClass(yFocusableEClass, YFocusable.class, "YFocusable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getYFocusable_LayoutIdx(), ecorePackage.getEInt(), "layoutIdx", null, 0, 1, YFocusable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYFocusable_LayoutColumns(), ecorePackage.getEInt(), "layoutColumns", null, 0, 1, YFocusable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getYFocusable_TabIndex(), ecorePackage.getEInt(), "tabIndex", "-1", 0, 1, YFocusable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(yActionEClass, YAction.class, "YAction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2766,6 +2977,22 @@
 		initEClass(yTaggableEClass, YTaggable.class, "YTaggable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getYTaggable_Tags(), ecorePackage.getEString(), "tags", null, 0, -1, YTaggable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(yFocusNotifierEClass, YFocusNotifier.class, "YFocusNotifier", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getYFocusNotifier_LastFocusEvent(), this.getYEmbeddableEvent(), null, "lastFocusEvent", null, 0, 1, YFocusNotifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(yBlurNotifierEClass, YBlurNotifier.class, "YBlurNotifier", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getYBlurNotifier_LastBlurEvent(), this.getYEmbeddableEvent(), null, "lastBlurEvent", null, 0, 1, YBlurNotifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(yTextChangeNotifierEClass, YTextChangeNotifier.class, "YTextChangeNotifier", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getYTextChangeNotifier_LastTextChange(), ecorePackage.getEString(), "lastTextChange", null, 0, 1, YTextChangeNotifier.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(yEmbeddableEventEClass, YEmbeddableEvent.class, "YEmbeddableEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getYEmbeddableEvent_Time(), ecorePackage.getEDate(), "time", null, 0, 1, YEmbeddableEvent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getYEmbeddableEvent_Embeddable(), this.getYEmbeddable(), null, "embeddable", null, 0, 1, YEmbeddableEvent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYEmbeddableEvent_RawEvent(), ecorePackage.getEJavaObject(), "rawEvent", null, 0, 1, YEmbeddableEvent.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(yContextClickEventEClass, YContextClickEvent.class, "YContextClickEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
 		// Initialize enums and add enum literals
 		initEEnum(yDeviceTypeEEnum, YDeviceType.class, "YDeviceType");
 		addEEnumLiteral(yDeviceTypeEEnum, YDeviceType.IDE);
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YActionImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YActionImpl.java
index 45c41bf..91536df 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YActionImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YActionImpl.java
@@ -26,11 +26,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YActionImpl#isInitialEnabled <em>Initial Enabled</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YActionImpl#isEnabled <em>Enabled</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YActivatedEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YActivatedEndpointImpl.java
index bf894fe..3ccab01 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YActivatedEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YActivatedEndpointImpl.java
@@ -30,10 +30,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YActivatedEndpointImpl#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotImpl.java
index 4905de0..161b4c5 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotImpl.java
@@ -32,6 +32,7 @@
  * <em><b>YBean Slot</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotImpl#getName <em>Name</em>}</li>
@@ -40,7 +41,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotImpl#getEventTopic <em>Event Topic</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotImpl#isRedirectEvents <em>Redirect Events</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotListBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotListBindingEndpointImpl.java
index 378642c..0b3a9a8 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotListBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotListBindingEndpointImpl.java
@@ -29,13 +29,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotListBindingEndpointImpl#getAttributePath <em>Attribute Path</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotListBindingEndpointImpl#getBeanSlot <em>Bean Slot</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotListBindingEndpointImpl#getCollectionType <em>Collection Type</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotListBindingEndpointImpl#getCollectionTypeQualifiedName <em>Collection Type Qualified Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotValueBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotValueBindingEndpointImpl.java
index 90460c4..01bf846 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotValueBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YBeanSlotValueBindingEndpointImpl.java
@@ -29,11 +29,11 @@
  * <em><b>YBean Slot Value Binding Endpoint</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotValueBindingEndpointImpl#getAttributePath <em>Attribute Path</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YBeanSlotValueBindingEndpointImpl#getBeanSlot <em>Bean Slot</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YCommandSetImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YCommandSetImpl.java
index b89e7ad..775806e 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YCommandSetImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YCommandSetImpl.java
@@ -39,6 +39,7 @@
  * <em><b>YCommand Set</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YCommandSetImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YCommandSetImpl#getId <em>Id</em>}</li>
@@ -47,7 +48,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YCommandSetImpl#getCommands <em>Commands</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YCommandSetImpl#getTransientCommands <em>Transient Commands</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YContextValueBindingEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YContextValueBindingEndpointImpl.java
index 1644248..1ca6b76 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YContextValueBindingEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YContextValueBindingEndpointImpl.java
@@ -27,10 +27,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YContextValueBindingEndpointImpl#getUrlString <em>Url String</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDelegateConverterImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDelegateConverterImpl.java
index da5fd77..b705e30 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDelegateConverterImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDelegateConverterImpl.java
@@ -41,6 +41,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDelegateConverterImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDelegateConverterImpl#getId <em>Id</em>}</li>
@@ -48,7 +49,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDelegateConverterImpl#getProperties <em>Properties</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDelegateConverterImpl#getConverterId <em>Converter Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDetailBeanSlotImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDetailBeanSlotImpl.java
index 1695432..bce9b4b 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDetailBeanSlotImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDetailBeanSlotImpl.java
@@ -30,11 +30,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDetailBeanSlotImpl#getMasterBeanSlot <em>Master Bean Slot</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDetailBeanSlotImpl#getPropertyPath <em>Property Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDialogImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDialogImpl.java
index 26886a8..9bbb7b6 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDialogImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDialogImpl.java
@@ -42,6 +42,7 @@
  * <em><b>YDialog</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDialogImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDialogImpl#getId <em>Id</em>}</li>
@@ -61,7 +62,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDialogImpl#getTypeQualifiedName <em>Type Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDialogImpl#getDatadescription <em>Datadescription</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDtWrapperImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDtWrapperImpl.java
index 90dfa71..a2977f7 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDtWrapperImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YDtWrapperImpl.java
@@ -38,6 +38,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDtWrapperImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDtWrapperImpl#getId <em>Id</em>}</li>
@@ -46,7 +47,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDtWrapperImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YDtWrapperImpl#getValidators <em>Validators</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableCollectionEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableCollectionEndpointImpl.java
index 57c3a7a..04954c4 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableCollectionEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableCollectionEndpointImpl.java
@@ -30,10 +30,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableCollectionEndpointImpl#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableImpl.java
index a2745f1..168ba3b 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableImpl.java
@@ -31,6 +31,7 @@
 import org.eclipse.osbp.ecview.core.common.model.binding.YValueBindingEndpoint;
 import org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage;
 import org.eclipse.osbp.ecview.core.common.model.core.YAuthorizationable;
+import org.eclipse.osbp.ecview.core.common.model.core.YContextClickEvent;
 import org.eclipse.osbp.ecview.core.common.model.core.YCssAble;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable;
 import org.eclipse.osbp.ecview.core.common.model.core.YHelperLayoutProvider;
@@ -46,6 +47,7 @@
  * <em><b>YUi Embeddable</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableImpl#getId <em>Id</em>}</li>
@@ -63,8 +65,8 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableImpl#getMementoId <em>Memento Id</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableImpl#getLabel <em>Label</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableImpl#getLabelI18nKey <em>Label I1 8n Key</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableImpl#getLastContextClick <em>Last Context Click</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -301,6 +303,15 @@
 	protected static final String LABEL_I1_8N_KEY_EDEFAULT = null;
 
 	/**
+	 * The cached value of the '{@link #getLastContextClick() <em>Last Context Click</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastContextClick()
+	 * @generated
+	 * @ordered
+	 */
+	protected YContextClickEvent lastContextClick;
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -631,6 +642,44 @@
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YContextClickEvent getLastContextClick() {
+		if (lastContextClick != null && lastContextClick.eIsProxy()) {
+			InternalEObject oldLastContextClick = (InternalEObject)lastContextClick;
+			lastContextClick = (YContextClickEvent)eResolveProxy(oldLastContextClick);
+			if (lastContextClick != oldLastContextClick) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CoreModelPackage.YEMBEDDABLE__LAST_CONTEXT_CLICK, oldLastContextClick, lastContextClick));
+			}
+		}
+		return lastContextClick;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public YContextClickEvent basicGetLastContextClick() {
+		return lastContextClick;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastContextClick(YContextClickEvent newLastContextClick) {
+		YContextClickEvent oldLastContextClick = lastContextClick;
+		lastContextClick = newLastContextClick;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CoreModelPackage.YEMBEDDABLE__LAST_CONTEXT_CLICK, oldLastContextClick, lastContextClick));
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated NOT
@@ -727,6 +776,9 @@
 				return getLabel();
 			case CoreModelPackage.YEMBEDDABLE__LABEL_I1_8N_KEY:
 				return getLabelI18nKey();
+			case CoreModelPackage.YEMBEDDABLE__LAST_CONTEXT_CLICK:
+				if (resolve) return getLastContextClick();
+				return basicGetLastContextClick();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -790,6 +842,9 @@
 			case CoreModelPackage.YEMBEDDABLE__LABEL_I1_8N_KEY:
 				setLabelI18nKey((String)newValue);
 				return;
+			case CoreModelPackage.YEMBEDDABLE__LAST_CONTEXT_CLICK:
+				setLastContextClick((YContextClickEvent)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -849,6 +904,9 @@
 			case CoreModelPackage.YEMBEDDABLE__LABEL_I1_8N_KEY:
 				setLabelI18nKey(LABEL_I1_8N_KEY_EDEFAULT);
 				return;
+			case CoreModelPackage.YEMBEDDABLE__LAST_CONTEXT_CLICK:
+				setLastContextClick((YContextClickEvent)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -892,6 +950,8 @@
 				return LABEL_EDEFAULT == null ? getLabel() != null : !LABEL_EDEFAULT.equals(getLabel());
 			case CoreModelPackage.YEMBEDDABLE__LABEL_I1_8N_KEY:
 				return LABEL_I1_8N_KEY_EDEFAULT == null ? getLabelI18nKey() != null : !LABEL_I1_8N_KEY_EDEFAULT.equals(getLabelI18nKey());
+			case CoreModelPackage.YEMBEDDABLE__LAST_CONTEXT_CLICK:
+				return lastContextClick != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableMultiSelectionEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableMultiSelectionEndpointImpl.java
index 2205b8e..dd3baa9 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableMultiSelectionEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableMultiSelectionEndpointImpl.java
@@ -30,10 +30,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableMultiSelectionEndpointImpl#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableSelectionEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableSelectionEndpointImpl.java
index d3d768c..3161e26 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableSelectionEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableSelectionEndpointImpl.java
@@ -30,11 +30,11 @@
  * <em><b>YEmbeddable Selection Endpoint</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableSelectionEndpointImpl#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableSelectionEndpointImpl#getAttributePath <em>Attribute Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableValueEndpointImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableValueEndpointImpl.java
index c1394a4..9e4290a 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableValueEndpointImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YEmbeddableValueEndpointImpl.java
@@ -30,10 +30,10 @@
  * <em><b>YEmbeddable Value Endpoint</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YEmbeddableValueEndpointImpl#getElement <em>Element</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YExposedActionImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YExposedActionImpl.java
index 1f0e718..38a48eb 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YExposedActionImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YExposedActionImpl.java
@@ -40,6 +40,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YExposedActionImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YExposedActionImpl#getId <em>Id</em>}</li>
@@ -57,7 +58,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YExposedActionImpl#isCheckDirty <em>Check Dirty</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YExposedActionImpl#getExternalCommandId <em>External Command Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YFieldImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YFieldImpl.java
index 767a3f0..a01e433 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YFieldImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YFieldImpl.java
@@ -41,17 +41,19 @@
  * <em><b>YUi Field</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#isInitialEditable <em>Initial Editable</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#isEditable <em>Editable</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#isInitialEnabled <em>Initial Enabled</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#isEnabled <em>Enabled</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#getLayoutIdx <em>Layout Idx</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#getLayoutColumns <em>Layout Columns</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#getTabIndex <em>Tab Index</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#getValidators <em>Validators</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#getInternalValidators <em>Internal Validators</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YFieldImpl#getConverter <em>Converter</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -126,6 +128,42 @@
 	protected boolean enabled = ENABLED_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getLayoutIdx() <em>Layout Idx</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLayoutIdx()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int LAYOUT_IDX_EDEFAULT = 0;
+	/**
+	 * The cached value of the '{@link #getLayoutIdx() <em>Layout Idx</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLayoutIdx()
+	 * @generated
+	 * @ordered
+	 */
+	protected int layoutIdx = LAYOUT_IDX_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getLayoutColumns() <em>Layout Columns</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLayoutColumns()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int LAYOUT_COLUMNS_EDEFAULT = 0;
+	/**
+	 * The cached value of the '{@link #getLayoutColumns() <em>Layout Columns</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLayoutColumns()
+	 * @generated
+	 * @ordered
+	 */
+	protected int layoutColumns = LAYOUT_COLUMNS_EDEFAULT;
+	/**
 	 * The default value of the '{@link #getTabIndex() <em>Tab Index</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -282,6 +320,48 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public int getLayoutIdx() {
+		return layoutIdx;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLayoutIdx(int newLayoutIdx) {
+		int oldLayoutIdx = layoutIdx;
+		layoutIdx = newLayoutIdx;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CoreModelPackage.YFIELD__LAYOUT_IDX, oldLayoutIdx, layoutIdx));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getLayoutColumns() {
+		return layoutColumns;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLayoutColumns(int newLayoutColumns) {
+		int oldLayoutColumns = layoutColumns;
+		layoutColumns = newLayoutColumns;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CoreModelPackage.YFIELD__LAYOUT_COLUMNS, oldLayoutColumns, layoutColumns));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public int getTabIndex() {
 		return tabIndex;
 	}
@@ -549,6 +629,10 @@
 				return isInitialEnabled();
 			case CoreModelPackage.YFIELD__ENABLED:
 				return isEnabled();
+			case CoreModelPackage.YFIELD__LAYOUT_IDX:
+				return getLayoutIdx();
+			case CoreModelPackage.YFIELD__LAYOUT_COLUMNS:
+				return getLayoutColumns();
 			case CoreModelPackage.YFIELD__TAB_INDEX:
 				return getTabIndex();
 			case CoreModelPackage.YFIELD__VALIDATORS:
@@ -582,6 +666,12 @@
 			case CoreModelPackage.YFIELD__ENABLED:
 				setEnabled((Boolean)newValue);
 				return;
+			case CoreModelPackage.YFIELD__LAYOUT_IDX:
+				setLayoutIdx((Integer)newValue);
+				return;
+			case CoreModelPackage.YFIELD__LAYOUT_COLUMNS:
+				setLayoutColumns((Integer)newValue);
+				return;
 			case CoreModelPackage.YFIELD__TAB_INDEX:
 				setTabIndex((Integer)newValue);
 				return;
@@ -619,6 +709,12 @@
 			case CoreModelPackage.YFIELD__ENABLED:
 				setEnabled(ENABLED_EDEFAULT);
 				return;
+			case CoreModelPackage.YFIELD__LAYOUT_IDX:
+				setLayoutIdx(LAYOUT_IDX_EDEFAULT);
+				return;
+			case CoreModelPackage.YFIELD__LAYOUT_COLUMNS:
+				setLayoutColumns(LAYOUT_COLUMNS_EDEFAULT);
+				return;
 			case CoreModelPackage.YFIELD__TAB_INDEX:
 				setTabIndex(TAB_INDEX_EDEFAULT);
 				return;
@@ -650,6 +746,10 @@
 				return initialEnabled != INITIAL_ENABLED_EDEFAULT;
 			case CoreModelPackage.YFIELD__ENABLED:
 				return enabled != ENABLED_EDEFAULT;
+			case CoreModelPackage.YFIELD__LAYOUT_IDX:
+				return layoutIdx != LAYOUT_IDX_EDEFAULT;
+			case CoreModelPackage.YFIELD__LAYOUT_COLUMNS:
+				return layoutColumns != LAYOUT_COLUMNS_EDEFAULT;
 			case CoreModelPackage.YFIELD__TAB_INDEX:
 				return tabIndex != TAB_INDEX_EDEFAULT;
 			case CoreModelPackage.YFIELD__VALIDATORS:
@@ -684,6 +784,8 @@
 		}
 		if (baseClass == YFocusable.class) {
 			switch (derivedFeatureID) {
+				case CoreModelPackage.YFIELD__LAYOUT_IDX: return CoreModelPackage.YFOCUSABLE__LAYOUT_IDX;
+				case CoreModelPackage.YFIELD__LAYOUT_COLUMNS: return CoreModelPackage.YFOCUSABLE__LAYOUT_COLUMNS;
 				case CoreModelPackage.YFIELD__TAB_INDEX: return CoreModelPackage.YFOCUSABLE__TAB_INDEX;
 				default: return -1;
 			}
@@ -713,6 +815,8 @@
 		}
 		if (baseClass == YFocusable.class) {
 			switch (baseFeatureID) {
+				case CoreModelPackage.YFOCUSABLE__LAYOUT_IDX: return CoreModelPackage.YFIELD__LAYOUT_IDX;
+				case CoreModelPackage.YFOCUSABLE__LAYOUT_COLUMNS: return CoreModelPackage.YFIELD__LAYOUT_COLUMNS;
 				case CoreModelPackage.YFOCUSABLE__TAB_INDEX: return CoreModelPackage.YFIELD__TAB_INDEX;
 				default: return -1;
 			}
@@ -737,6 +841,10 @@
 		result.append(initialEnabled);
 		result.append(", enabled: ");
 		result.append(enabled);
+		result.append(", layoutIdx: ");
+		result.append(layoutIdx);
+		result.append(", layoutColumns: ");
+		result.append(layoutColumns);
 		result.append(", tabIndex: ");
 		result.append(tabIndex);
 		result.append(')');
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YHelperLayoutImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YHelperLayoutImpl.java
index deeefa5..c4f762c 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YHelperLayoutImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YHelperLayoutImpl.java
@@ -28,10 +28,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YHelperLayoutImpl#getVirtualElements <em>Virtual Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YKeyStrokeDefinitionImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YKeyStrokeDefinitionImpl.java
index b0a2422..72d930d 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YKeyStrokeDefinitionImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YKeyStrokeDefinitionImpl.java
@@ -39,6 +39,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YKeyStrokeDefinitionImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YKeyStrokeDefinitionImpl#getId <em>Id</em>}</li>
@@ -47,7 +48,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YKeyStrokeDefinitionImpl#getKeyCode <em>Key Code</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YKeyStrokeDefinitionImpl#getModifierKeys <em>Modifier Keys</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YLayoutImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YLayoutImpl.java
index 168109c..54e78f0 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YLayoutImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YLayoutImpl.java
@@ -30,14 +30,16 @@
  * <em><b>YUi Layout</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YLayoutImpl#isInitialEditable <em>Initial Editable</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YLayoutImpl#isEditable <em>Editable</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YLayoutImpl#isInitialEnabled <em>Initial Enabled</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YLayoutImpl#isEnabled <em>Enabled</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YLayoutImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YLayoutImpl#getLastComponentAttach <em>Last Component Attach</em>}</li>
+ *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YLayoutImpl#getLastComponentDetach <em>Last Component Detach</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -124,6 +126,43 @@
 	protected EList<YEmbeddable> elements;
 
 	/**
+	 * The default value of the '{@link #getLastComponentAttach() <em>Last Component Attach</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastComponentAttach()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Object LAST_COMPONENT_ATTACH_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getLastComponentAttach() <em>Last Component Attach</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastComponentAttach()
+	 * @generated
+	 * @ordered
+	 */
+	protected Object lastComponentAttach = LAST_COMPONENT_ATTACH_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getLastComponentDetach() <em>Last Component Detach</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastComponentDetach()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Object LAST_COMPONENT_DETACH_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getLastComponentDetach() <em>Last Component Detach</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastComponentDetach()
+	 * @generated
+	 * @ordered
+	 */
+	protected Object lastComponentDetach = LAST_COMPONENT_DETACH_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -236,6 +275,48 @@
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getLastComponentAttach() {
+		return lastComponentAttach;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastComponentAttach(Object newLastComponentAttach) {
+		Object oldLastComponentAttach = lastComponentAttach;
+		lastComponentAttach = newLastComponentAttach;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CoreModelPackage.YLAYOUT__LAST_COMPONENT_ATTACH, oldLastComponentAttach, lastComponentAttach));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getLastComponentDetach() {
+		return lastComponentDetach;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastComponentDetach(Object newLastComponentDetach) {
+		Object oldLastComponentDetach = lastComponentDetach;
+		lastComponentDetach = newLastComponentDetach;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CoreModelPackage.YLAYOUT__LAST_COMPONENT_DETACH, oldLastComponentDetach, lastComponentDetach));
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -266,6 +347,10 @@
 				return isEnabled();
 			case CoreModelPackage.YLAYOUT__ELEMENTS:
 				return getElements();
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_ATTACH:
+				return getLastComponentAttach();
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_DETACH:
+				return getLastComponentDetach();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -294,6 +379,12 @@
 				getElements().clear();
 				getElements().addAll((Collection<? extends YEmbeddable>)newValue);
 				return;
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_ATTACH:
+				setLastComponentAttach(newValue);
+				return;
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_DETACH:
+				setLastComponentDetach(newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -320,6 +411,12 @@
 			case CoreModelPackage.YLAYOUT__ELEMENTS:
 				getElements().clear();
 				return;
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_ATTACH:
+				setLastComponentAttach(LAST_COMPONENT_ATTACH_EDEFAULT);
+				return;
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_DETACH:
+				setLastComponentDetach(LAST_COMPONENT_DETACH_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -341,6 +438,10 @@
 				return enabled != ENABLED_EDEFAULT;
 			case CoreModelPackage.YLAYOUT__ELEMENTS:
 				return elements != null && !elements.isEmpty();
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_ATTACH:
+				return LAST_COMPONENT_ATTACH_EDEFAULT == null ? lastComponentAttach != null : !LAST_COMPONENT_ATTACH_EDEFAULT.equals(lastComponentAttach);
+			case CoreModelPackage.YLAYOUT__LAST_COMPONENT_DETACH:
+				return LAST_COMPONENT_DETACH_EDEFAULT == null ? lastComponentDetach != null : !LAST_COMPONENT_DETACH_EDEFAULT.equals(lastComponentDetach);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -411,6 +512,10 @@
 		result.append(initialEnabled);
 		result.append(", enabled: ");
 		result.append(enabled);
+		result.append(", lastComponentAttach: ");
+		result.append(lastComponentAttach);
+		result.append(", lastComponentDetach: ");
+		result.append(lastComponentDetach);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YOpenDialogCommandImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YOpenDialogCommandImpl.java
index a14d6ac..6339306 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YOpenDialogCommandImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YOpenDialogCommandImpl.java
@@ -42,6 +42,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YOpenDialogCommandImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YOpenDialogCommandImpl#getId <em>Id</em>}</li>
@@ -50,7 +51,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YOpenDialogCommandImpl#getDialog <em>Dialog</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YOpenDialogCommandImpl#getTrigger <em>Trigger</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YSendEventCommandImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YSendEventCommandImpl.java
index 4393cbf..8c9b487 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YSendEventCommandImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YSendEventCommandImpl.java
@@ -40,6 +40,7 @@
  * <em><b>YSend Event Command</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YSendEventCommandImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YSendEventCommandImpl#getId <em>Id</em>}</li>
@@ -50,7 +51,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YSendEventCommandImpl#getTrigger <em>Trigger</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YSendEventCommandImpl#isAutoTrigger <em>Auto Trigger</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YStringToStringMapImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YStringToStringMapImpl.java
index f2a7fdd..3a78559 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YStringToStringMapImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YStringToStringMapImpl.java
@@ -28,11 +28,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YStringToStringMapImpl#getTypedKey <em>Key</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YStringToStringMapImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YViewImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YViewImpl.java
index e70678e..f17dca6 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YViewImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YViewImpl.java
@@ -52,6 +52,7 @@
  * <em><b>YUi View</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YViewImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YViewImpl#getId <em>Id</em>}</li>
@@ -80,7 +81,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YViewImpl#getDisabledElements <em>Disabled Elements</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YViewImpl#getAuthorizationStore <em>Authorization Store</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YViewSetImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YViewSetImpl.java
index ef91078..8fd4125 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YViewSetImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/impl/YViewSetImpl.java
@@ -37,6 +37,7 @@
  * <em><b>YUi View Set</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YViewSetImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YViewSetImpl#getId <em>Id</em>}</li>
@@ -45,7 +46,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YViewSetImpl#getViews <em>Views</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.core.impl.YViewSetImpl#getBeanSlots <em>Bean Slots</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/util/CoreModelAdapterFactory.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/util/CoreModelAdapterFactory.java
index 7678f7f..e1cb56e 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/util/CoreModelAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/util/CoreModelAdapterFactory.java
@@ -320,6 +320,26 @@
 				return createYTaggableAdapter();
 			}
 			@Override
+			public Adapter caseYFocusNotifier(YFocusNotifier object) {
+				return createYFocusNotifierAdapter();
+			}
+			@Override
+			public Adapter caseYBlurNotifier(YBlurNotifier object) {
+				return createYBlurNotifierAdapter();
+			}
+			@Override
+			public Adapter caseYTextChangeNotifier(YTextChangeNotifier object) {
+				return createYTextChangeNotifierAdapter();
+			}
+			@Override
+			public Adapter caseYEmbeddableEvent(YEmbeddableEvent object) {
+				return createYEmbeddableEventAdapter();
+			}
+			@Override
+			public Adapter caseYContextClickEvent(YContextClickEvent object) {
+				return createYContextClickEventAdapter();
+			}
+			@Override
 			public Adapter caseYBindingEndpoint(YBindingEndpoint object) {
 				return createYBindingEndpointAdapter();
 			}
@@ -1060,6 +1080,76 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.core.YFocusNotifier <em>YFocus Notifier</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.YFocusNotifier
+	 * @generated
+	 */
+	public Adapter createYFocusNotifierAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.core.YBlurNotifier <em>YBlur Notifier</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.YBlurNotifier
+	 * @generated
+	 */
+	public Adapter createYBlurNotifierAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.core.YTextChangeNotifier <em>YText Change Notifier</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.YTextChangeNotifier
+	 * @generated
+	 */
+	public Adapter createYTextChangeNotifierAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.core.YEmbeddableEvent <em>YEmbeddable Event</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.YEmbeddableEvent
+	 * @generated
+	 */
+	public Adapter createYEmbeddableEventAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.core.YContextClickEvent <em>YContext Click Event</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.YContextClickEvent
+	 * @generated
+	 */
+	public Adapter createYContextClickEventAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.binding.YBindingEndpoint <em>YBinding Endpoint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/util/CoreModelSwitch.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/util/CoreModelSwitch.java
index 0188d34..03d4616 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/util/CoreModelSwitch.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/core/util/CoreModelSwitch.java
@@ -540,6 +540,37 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case CoreModelPackage.YFOCUS_NOTIFIER: {
+				YFocusNotifier yFocusNotifier = (YFocusNotifier)theEObject;
+				T result = caseYFocusNotifier(yFocusNotifier);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CoreModelPackage.YBLUR_NOTIFIER: {
+				YBlurNotifier yBlurNotifier = (YBlurNotifier)theEObject;
+				T result = caseYBlurNotifier(yBlurNotifier);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CoreModelPackage.YTEXT_CHANGE_NOTIFIER: {
+				YTextChangeNotifier yTextChangeNotifier = (YTextChangeNotifier)theEObject;
+				T result = caseYTextChangeNotifier(yTextChangeNotifier);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CoreModelPackage.YEMBEDDABLE_EVENT: {
+				YEmbeddableEvent yEmbeddableEvent = (YEmbeddableEvent)theEObject;
+				T result = caseYEmbeddableEvent(yEmbeddableEvent);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CoreModelPackage.YCONTEXT_CLICK_EVENT: {
+				YContextClickEvent yContextClickEvent = (YContextClickEvent)theEObject;
+				T result = caseYContextClickEvent(yContextClickEvent);
+				if (result == null) result = caseYEmbeddableEvent(yContextClickEvent);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -1295,6 +1326,81 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>YFocus Notifier</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>YFocus Notifier</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseYFocusNotifier(YFocusNotifier object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>YBlur Notifier</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>YBlur Notifier</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseYBlurNotifier(YBlurNotifier object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>YText Change Notifier</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>YText Change Notifier</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseYTextChangeNotifier(YTextChangeNotifier object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>YEmbeddable Event</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>YEmbeddable Event</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseYEmbeddableEvent(YEmbeddableEvent object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>YContext Click Event</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>YContext Click Event</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseYContextClickEvent(YContextClickEvent object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>YBinding Endpoint</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDatadescription.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDatadescription.java
index 4151956..7d7387e 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDatadescription.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDatadescription.java
@@ -18,11 +18,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.datatypes.YDatadescription#getLabel <em>Label</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.datatypes.YDatadescription#getLabelI18nKey <em>Label I1 8n Key</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.datatypes.DatatypesPackage#getYDatadescription()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDatatype.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDatatype.java
index cd19b80..53b7e11 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDatatype.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDatatype.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.datatypes.YDatatype#getValidators <em>Validators</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.datatypes.DatatypesPackage#getYDatatype()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDtBase.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDtBase.java
index 4f618f4..fc4f223 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDtBase.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/YDtBase.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.datatypes.YDtBase#getDescription <em>Description</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.datatypes.DatatypesPackage#getYDtBase()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/impl/YDatadescriptionImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/impl/YDatadescriptionImpl.java
index 60edec7..8527be8 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/impl/YDatadescriptionImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/impl/YDatadescriptionImpl.java
@@ -35,6 +35,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.datatypes.impl.YDatadescriptionImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.datatypes.impl.YDatadescriptionImpl#getId <em>Id</em>}</li>
@@ -44,7 +45,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.datatypes.impl.YDatadescriptionImpl#getLabel <em>Label</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.datatypes.impl.YDatadescriptionImpl#getLabelI18nKey <em>Label I1 8n Key</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/util/DatatypesSwitch.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/util/DatatypesSwitch.java
index ed72e47..d1c7d25 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/util/DatatypesSwitch.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/datatypes/util/DatatypesSwitch.java
@@ -58,7 +58,7 @@
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/ValidationFactory.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/ValidationFactory.java
index 9b132c2..1ef4258 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/ValidationFactory.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/ValidationFactory.java
@@ -75,6 +75,15 @@
 	YBeanValidationValidator createYBeanValidationValidator();
 
 	/**
+	 * Returns a new object of class '<em>YUnique Attribute Validator</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>YUnique Attribute Validator</em>'.
+	 * @generated
+	 */
+	YUniqueAttributeValidator createYUniqueAttributeValidator();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/ValidationPackage.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/ValidationPackage.java
index 64725a9..9c48f86 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/ValidationPackage.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/ValidationPackage.java
@@ -13,6 +13,7 @@
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage;
 
 /**
@@ -602,6 +603,124 @@
 	int YBEAN_VALIDATION_VALIDATOR_FEATURE_COUNT = YVALIDATOR_FEATURE_COUNT + 5;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YUniqueAttributeValidatorImpl <em>YUnique Attribute Validator</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.YUniqueAttributeValidatorImpl
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYUniqueAttributeValidator()
+	 * @generated
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR = 6;
+
+	/**
+	 * The feature id for the '<em><b>Tags</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__TAGS = YVALIDATOR__TAGS;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__ID = YVALIDATOR__ID;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__NAME = YVALIDATOR__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__PROPERTIES = YVALIDATOR__PROPERTIES;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__TYPE = YVALIDATOR__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Error Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__ERROR_CODE = YVALIDATOR_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Default Error Message</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__DEFAULT_ERROR_MESSAGE = YVALIDATOR_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Val Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__VAL_TYPE = YVALIDATOR_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Val Type Fully Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__VAL_TYPE_FULLY_QUALIFIED_NAME = YVALIDATOR_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Property Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__PROPERTY_PATH = YVALIDATOR_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Container Value Binding Endpoint</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR__CONTAINER_VALUE_BINDING_ENDPOINT = YVALIDATOR_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of structural features of the '<em>YUnique Attribute Validator</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR_FEATURE_COUNT = YVALIDATOR_FEATURE_COUNT + 6;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.validation.YValidationConfig <em>YValidation Config</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -609,7 +728,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYValidationConfig()
 	 * @generated
 	 */
-	int YVALIDATION_CONFIG = 6;
+	int YVALIDATION_CONFIG = 7;
 
 	/**
 	 * The feature id for the '<em><b>Error Code</b></em>' attribute.
@@ -646,7 +765,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYMinLengthValidationConfig()
 	 * @generated
 	 */
-	int YMIN_LENGTH_VALIDATION_CONFIG = 7;
+	int YMIN_LENGTH_VALIDATION_CONFIG = 8;
 
 	/**
 	 * The feature id for the '<em><b>Error Code</b></em>' attribute.
@@ -692,7 +811,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYMaxLengthValidationConfig()
 	 * @generated
 	 */
-	int YMAX_LENGTH_VALIDATION_CONFIG = 8;
+	int YMAX_LENGTH_VALIDATION_CONFIG = 9;
 
 	/**
 	 * The feature id for the '<em><b>Error Code</b></em>' attribute.
@@ -738,7 +857,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYRegexpValidationConfig()
 	 * @generated
 	 */
-	int YREGEXP_VALIDATION_CONFIG = 9;
+	int YREGEXP_VALIDATION_CONFIG = 10;
 
 	/**
 	 * The feature id for the '<em><b>Error Code</b></em>' attribute.
@@ -784,7 +903,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYClassDelegateValidationConfig()
 	 * @generated
 	 */
-	int YCLASS_DELEGATE_VALIDATION_CONFIG = 10;
+	int YCLASS_DELEGATE_VALIDATION_CONFIG = 11;
 
 	/**
 	 * The feature id for the '<em><b>Error Code</b></em>' attribute.
@@ -830,7 +949,7 @@
 	 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYBeanValidationValidatorConfig()
 	 * @generated
 	 */
-	int YBEAN_VALIDATION_VALIDATOR_CONFIG = 11;
+	int YBEAN_VALIDATION_VALIDATOR_CONFIG = 12;
 
 	/**
 	 * The feature id for the '<em><b>Error Code</b></em>' attribute.
@@ -887,6 +1006,79 @@
 	int YBEAN_VALIDATION_VALIDATOR_CONFIG_FEATURE_COUNT = YVALIDATION_CONFIG_FEATURE_COUNT + 3;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig <em>YUnique Attribute Validator Config</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYUniqueAttributeValidatorConfig()
+	 * @generated
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG = 13;
+
+	/**
+	 * The feature id for the '<em><b>Error Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__ERROR_CODE = YVALIDATION_CONFIG__ERROR_CODE;
+
+	/**
+	 * The feature id for the '<em><b>Default Error Message</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__DEFAULT_ERROR_MESSAGE = YVALIDATION_CONFIG__DEFAULT_ERROR_MESSAGE;
+
+	/**
+	 * The feature id for the '<em><b>Val Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__VAL_TYPE = YVALIDATION_CONFIG_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Val Type Fully Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__VAL_TYPE_FULLY_QUALIFIED_NAME = YVALIDATION_CONFIG_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Property Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__PROPERTY_PATH = YVALIDATION_CONFIG_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Container Value Binding Endpoint</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__CONTAINER_VALUE_BINDING_ENDPOINT = YVALIDATION_CONFIG_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>YUnique Attribute Validator Config</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG_FEATURE_COUNT = YVALIDATION_CONFIG_FEATURE_COUNT + 4;
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.validation.YValidator <em>YValidator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -958,6 +1150,16 @@
 	EClass getYBeanValidationValidator();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidator <em>YUnique Attribute Validator</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>YUnique Attribute Validator</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidator
+	 * @generated
+	 */
+	EClass getYUniqueAttributeValidator();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.validation.YValidationConfig <em>YValidation Config</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1117,6 +1319,60 @@
 	EAttribute getYBeanValidationValidatorConfig_BvalProperty();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig <em>YUnique Attribute Validator Config</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>YUnique Attribute Validator Config</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig
+	 * @generated
+	 */
+	EClass getYUniqueAttributeValidatorConfig();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig#getValType <em>Val Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Val Type</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig#getValType()
+	 * @see #getYUniqueAttributeValidatorConfig()
+	 * @generated
+	 */
+	EAttribute getYUniqueAttributeValidatorConfig_ValType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig#getValTypeFullyQualifiedName <em>Val Type Fully Qualified Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Val Type Fully Qualified Name</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig#getValTypeFullyQualifiedName()
+	 * @see #getYUniqueAttributeValidatorConfig()
+	 * @generated
+	 */
+	EAttribute getYUniqueAttributeValidatorConfig_ValTypeFullyQualifiedName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig#getPropertyPath <em>Property Path</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Property Path</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig#getPropertyPath()
+	 * @see #getYUniqueAttributeValidatorConfig()
+	 * @generated
+	 */
+	EAttribute getYUniqueAttributeValidatorConfig_PropertyPath();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig#getContainerValueBindingEndpoint <em>Container Value Binding Endpoint</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Container Value Binding Endpoint</em>'.
+	 * @see org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig#getContainerValueBindingEndpoint()
+	 * @see #getYUniqueAttributeValidatorConfig()
+	 * @generated
+	 */
+	EReference getYUniqueAttributeValidatorConfig_ContainerValueBindingEndpoint();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1208,6 +1464,16 @@
 		EClass YBEAN_VALIDATION_VALIDATOR = eINSTANCE.getYBeanValidationValidator();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YUniqueAttributeValidatorImpl <em>YUnique Attribute Validator</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.YUniqueAttributeValidatorImpl
+		 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYUniqueAttributeValidator()
+		 * @generated
+		 */
+		EClass YUNIQUE_ATTRIBUTE_VALIDATOR = eINSTANCE.getYUniqueAttributeValidator();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.validation.YValidationConfig <em>YValidation Config</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1339,6 +1605,48 @@
 		 */
 		EAttribute YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_PROPERTY = eINSTANCE.getYBeanValidationValidatorConfig_BvalProperty();
 
+		/**
+		 * The meta object literal for the '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig <em>YUnique Attribute Validator Config</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig
+		 * @see org.eclipse.osbp.ecview.core.common.model.validation.impl.ValidationPackageImpl#getYUniqueAttributeValidatorConfig()
+		 * @generated
+		 */
+		EClass YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG = eINSTANCE.getYUniqueAttributeValidatorConfig();
+
+		/**
+		 * The meta object literal for the '<em><b>Val Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__VAL_TYPE = eINSTANCE.getYUniqueAttributeValidatorConfig_ValType();
+
+		/**
+		 * The meta object literal for the '<em><b>Val Type Fully Qualified Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__VAL_TYPE_FULLY_QUALIFIED_NAME = eINSTANCE.getYUniqueAttributeValidatorConfig_ValTypeFullyQualifiedName();
+
+		/**
+		 * The meta object literal for the '<em><b>Property Path</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__PROPERTY_PATH = eINSTANCE.getYUniqueAttributeValidatorConfig_PropertyPath();
+
+		/**
+		 * The meta object literal for the '<em><b>Container Value Binding Endpoint</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__CONTAINER_VALUE_BINDING_ENDPOINT = eINSTANCE.getYUniqueAttributeValidatorConfig_ContainerValueBindingEndpoint();
+
 	}
 
 } 
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YBeanValidationValidatorConfig.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YBeanValidationValidatorConfig.java
index 9021457..e8cf0e3 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YBeanValidationValidatorConfig.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YBeanValidationValidatorConfig.java
@@ -18,12 +18,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidatorConfig#getBvalClass <em>Bval Class</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidatorConfig#getBvalClassFullyQualifiedName <em>Bval Class Fully Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidatorConfig#getBvalProperty <em>Bval Property</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage#getYBeanValidationValidatorConfig()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YClassDelegateValidationConfig.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YClassDelegateValidationConfig.java
index d676039..19ceb47 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YClassDelegateValidationConfig.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YClassDelegateValidationConfig.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YClassDelegateValidationConfig#getClassName <em>Class Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage#getYClassDelegateValidationConfig()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YMaxLengthValidationConfig.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YMaxLengthValidationConfig.java
index 353e947..c093c03 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YMaxLengthValidationConfig.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YMaxLengthValidationConfig.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YMaxLengthValidationConfig#getMaxLength <em>Max Length</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage#getYMaxLengthValidationConfig()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YMinLengthValidationConfig.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YMinLengthValidationConfig.java
index df22038..8a61287 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YMinLengthValidationConfig.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YMinLengthValidationConfig.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YMinLengthValidationConfig#getMinLength <em>Min Length</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage#getYMinLengthValidationConfig()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YRegexpValidationConfig.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YRegexpValidationConfig.java
index 1f7eb64..b6e6b94 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YRegexpValidationConfig.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YRegexpValidationConfig.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YRegexpValidationConfig#getRegExpression <em>Reg Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage#getYRegexpValidationConfig()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YValidationConfig.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YValidationConfig.java
index 365fe8e..182a5a8 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YValidationConfig.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YValidationConfig.java
@@ -19,11 +19,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YValidationConfig#getErrorCode <em>Error Code</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YValidationConfig#getDefaultErrorMessage <em>Default Error Message</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage#getYValidationConfig()
  * @model interface="true" abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YValidator.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YValidator.java
index 552a1a7..02d7836 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YValidator.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/YValidator.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.YValidator#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage#getYValidator()
  * @model abstract="true"
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/ValidationFactoryImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/ValidationFactoryImpl.java
index 39a9e7b..c9996cf 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/ValidationFactoryImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/ValidationFactoryImpl.java
@@ -15,6 +15,7 @@
 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.core.common.model.validation.*;
 import org.eclipse.osbp.ecview.core.common.model.validation.ValidationFactory;
 import org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage;
 import org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidator;
@@ -72,6 +73,7 @@
 			case ValidationPackage.YREGEXP_VALIDATOR: return createYRegexpValidator();
 			case ValidationPackage.YCLASS_DELEGATE_VALIDATOR: return createYClassDelegateValidator();
 			case ValidationPackage.YBEAN_VALIDATION_VALIDATOR: return createYBeanValidationValidator();
+			case ValidationPackage.YUNIQUE_ATTRIBUTE_VALIDATOR: return createYUniqueAttributeValidator();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -132,6 +134,16 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public YUniqueAttributeValidator createYUniqueAttributeValidator() {
+		YUniqueAttributeValidatorImpl yUniqueAttributeValidator = new YUniqueAttributeValidatorImpl();
+		return yUniqueAttributeValidator;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ValidationPackage getValidationPackage() {
 		return (ValidationPackage)getEPackage();
 	}
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/ValidationPackageImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/ValidationPackageImpl.java
index 78d06ff..0438219 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/ValidationPackageImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/ValidationPackageImpl.java
@@ -14,6 +14,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EGenericType;
 import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.osbp.ecview.core.common.model.binding.BindingPackage;
 import org.eclipse.osbp.ecview.core.common.model.binding.impl.BindingPackageImpl;
@@ -35,6 +36,8 @@
 import org.eclipse.osbp.ecview.core.common.model.validation.YMinLengthValidator;
 import org.eclipse.osbp.ecview.core.common.model.validation.YRegexpValidationConfig;
 import org.eclipse.osbp.ecview.core.common.model.validation.YRegexpValidator;
+import org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidator;
+import org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig;
 import org.eclipse.osbp.ecview.core.common.model.validation.YValidationConfig;
 import org.eclipse.osbp.ecview.core.common.model.validation.YValidator;
 import org.eclipse.osbp.ecview.core.common.model.visibility.VisibilityPackage;
@@ -94,6 +97,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass yUniqueAttributeValidatorEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass yValidationConfigEClass = null;
 
 	/**
@@ -132,6 +142,13 @@
 	private EClass yBeanValidationValidatorConfigEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass yUniqueAttributeValidatorConfigEClass = 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.
@@ -277,6 +294,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getYUniqueAttributeValidator() {
+		return yUniqueAttributeValidatorEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getYValidationConfig() {
 		return yValidationConfigEClass;
 	}
@@ -412,6 +438,51 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getYUniqueAttributeValidatorConfig() {
+		return yUniqueAttributeValidatorConfigEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYUniqueAttributeValidatorConfig_ValType() {
+		return (EAttribute)yUniqueAttributeValidatorConfigEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYUniqueAttributeValidatorConfig_ValTypeFullyQualifiedName() {
+		return (EAttribute)yUniqueAttributeValidatorConfigEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getYUniqueAttributeValidatorConfig_PropertyPath() {
+		return (EAttribute)yUniqueAttributeValidatorConfigEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getYUniqueAttributeValidatorConfig_ContainerValueBindingEndpoint() {
+		return (EReference)yUniqueAttributeValidatorConfigEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ValidationFactory getValidationFactory() {
 		return (ValidationFactory)getEFactoryInstance();
 	}
@@ -448,6 +519,8 @@
 
 		yBeanValidationValidatorEClass = createEClass(YBEAN_VALIDATION_VALIDATOR);
 
+		yUniqueAttributeValidatorEClass = createEClass(YUNIQUE_ATTRIBUTE_VALIDATOR);
+
 		yValidationConfigEClass = createEClass(YVALIDATION_CONFIG);
 		createEAttribute(yValidationConfigEClass, YVALIDATION_CONFIG__ERROR_CODE);
 		createEAttribute(yValidationConfigEClass, YVALIDATION_CONFIG__DEFAULT_ERROR_MESSAGE);
@@ -468,6 +541,12 @@
 		createEAttribute(yBeanValidationValidatorConfigEClass, YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS);
 		createEAttribute(yBeanValidationValidatorConfigEClass, YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_CLASS_FULLY_QUALIFIED_NAME);
 		createEAttribute(yBeanValidationValidatorConfigEClass, YBEAN_VALIDATION_VALIDATOR_CONFIG__BVAL_PROPERTY);
+
+		yUniqueAttributeValidatorConfigEClass = createEClass(YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG);
+		createEAttribute(yUniqueAttributeValidatorConfigEClass, YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__VAL_TYPE);
+		createEAttribute(yUniqueAttributeValidatorConfigEClass, YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__VAL_TYPE_FULLY_QUALIFIED_NAME);
+		createEAttribute(yUniqueAttributeValidatorConfigEClass, YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__PROPERTY_PATH);
+		createEReference(yUniqueAttributeValidatorConfigEClass, YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG__CONTAINER_VALUE_BINDING_ENDPOINT);
 	}
 
 	/**
@@ -495,6 +574,7 @@
 
 		// Obtain other dependent packages
 		CoreModelPackage theCoreModelPackage = (CoreModelPackage)EPackage.Registry.INSTANCE.getEPackage(CoreModelPackage.eNS_URI);
+		BindingPackage theBindingPackage = (BindingPackage)EPackage.Registry.INSTANCE.getEPackage(BindingPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -513,11 +593,14 @@
 		yClassDelegateValidatorEClass.getESuperTypes().add(this.getYClassDelegateValidationConfig());
 		yBeanValidationValidatorEClass.getESuperTypes().add(this.getYValidator());
 		yBeanValidationValidatorEClass.getESuperTypes().add(this.getYBeanValidationValidatorConfig());
+		yUniqueAttributeValidatorEClass.getESuperTypes().add(this.getYValidator());
+		yUniqueAttributeValidatorEClass.getESuperTypes().add(this.getYUniqueAttributeValidatorConfig());
 		yMinLengthValidationConfigEClass.getESuperTypes().add(this.getYValidationConfig());
 		yMaxLengthValidationConfigEClass.getESuperTypes().add(this.getYValidationConfig());
 		yRegexpValidationConfigEClass.getESuperTypes().add(this.getYValidationConfig());
 		yClassDelegateValidationConfigEClass.getESuperTypes().add(this.getYValidationConfig());
 		yBeanValidationValidatorConfigEClass.getESuperTypes().add(this.getYValidationConfig());
+		yUniqueAttributeValidatorConfigEClass.getESuperTypes().add(this.getYValidationConfig());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(yValidatorEClass, YValidator.class, "YValidator", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -536,6 +619,8 @@
 
 		initEClass(yBeanValidationValidatorEClass, YBeanValidationValidator.class, "YBeanValidationValidator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+		initEClass(yUniqueAttributeValidatorEClass, YUniqueAttributeValidator.class, "YUniqueAttributeValidator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
 		initEClass(yValidationConfigEClass, YValidationConfig.class, "YValidationConfig", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getYValidationConfig_ErrorCode(), ecorePackage.getEString(), "errorCode", null, 0, 1, YValidationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getYValidationConfig_DefaultErrorMessage(), ecorePackage.getEString(), "defaultErrorMessage", null, 0, 1, YValidationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -560,6 +645,15 @@
 		initEAttribute(getYBeanValidationValidatorConfig_BvalClassFullyQualifiedName(), ecorePackage.getEString(), "bvalClassFullyQualifiedName", null, 0, 1, YBeanValidationValidatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getYBeanValidationValidatorConfig_BvalProperty(), ecorePackage.getEString(), "bvalProperty", null, 0, 1, YBeanValidationValidatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(yUniqueAttributeValidatorConfigEClass, YUniqueAttributeValidatorConfig.class, "YUniqueAttributeValidatorConfig", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		g1 = createEGenericType(ecorePackage.getEJavaClass());
+		g2 = createEGenericType();
+		g1.getETypeArguments().add(g2);
+		initEAttribute(getYUniqueAttributeValidatorConfig_ValType(), g1, "valType", null, 0, 1, YUniqueAttributeValidatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYUniqueAttributeValidatorConfig_ValTypeFullyQualifiedName(), ecorePackage.getEString(), "valTypeFullyQualifiedName", null, 0, 1, YUniqueAttributeValidatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getYUniqueAttributeValidatorConfig_PropertyPath(), ecorePackage.getEString(), "propertyPath", null, 0, 1, YUniqueAttributeValidatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getYUniqueAttributeValidatorConfig_ContainerValueBindingEndpoint(), theBindingPackage.getYValueBindingEndpoint(), null, "containerValueBindingEndpoint", null, 0, 1, YUniqueAttributeValidatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Create resource
 		createResource(eNS_URI);
 	}
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YBeanValidationValidatorImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YBeanValidationValidatorImpl.java
index 5141980..6653994 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YBeanValidationValidatorImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YBeanValidationValidatorImpl.java
@@ -24,6 +24,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YBeanValidationValidatorImpl#getErrorCode <em>Error Code</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YBeanValidationValidatorImpl#getDefaultErrorMessage <em>Default Error Message</em>}</li>
@@ -31,7 +32,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YBeanValidationValidatorImpl#getBvalClassFullyQualifiedName <em>Bval Class Fully Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YBeanValidationValidatorImpl#getBvalProperty <em>Bval Property</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YClassDelegateValidatorImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YClassDelegateValidatorImpl.java
index 79eb332..4a46783 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YClassDelegateValidatorImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YClassDelegateValidatorImpl.java
@@ -24,12 +24,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YClassDelegateValidatorImpl#getErrorCode <em>Error Code</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YClassDelegateValidatorImpl#getDefaultErrorMessage <em>Default Error Message</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YClassDelegateValidatorImpl#getClassName <em>Class Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YMaxLengthValidatorImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YMaxLengthValidatorImpl.java
index 02c8362..44f2b54 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YMaxLengthValidatorImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YMaxLengthValidatorImpl.java
@@ -24,12 +24,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YMaxLengthValidatorImpl#getErrorCode <em>Error Code</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YMaxLengthValidatorImpl#getDefaultErrorMessage <em>Default Error Message</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YMaxLengthValidatorImpl#getMaxLength <em>Max Length</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YMinLengthValidatorImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YMinLengthValidatorImpl.java
index 6eb50bc..c793916 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YMinLengthValidatorImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YMinLengthValidatorImpl.java
@@ -24,12 +24,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YMinLengthValidatorImpl#getErrorCode <em>Error Code</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YMinLengthValidatorImpl#getDefaultErrorMessage <em>Default Error Message</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YMinLengthValidatorImpl#getMinLength <em>Min Length</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YRegexpValidatorImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YRegexpValidatorImpl.java
index 6d4d118..761755d 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YRegexpValidatorImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YRegexpValidatorImpl.java
@@ -24,12 +24,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YRegexpValidatorImpl#getErrorCode <em>Error Code</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YRegexpValidatorImpl#getDefaultErrorMessage <em>Default Error Message</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YRegexpValidatorImpl#getRegExpression <em>Reg Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YValidatorImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YValidatorImpl.java
index ebd3a87..083ce44 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YValidatorImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/impl/YValidatorImpl.java
@@ -35,6 +35,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YValidatorImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YValidatorImpl#getId <em>Id</em>}</li>
@@ -42,7 +43,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YValidatorImpl#getProperties <em>Properties</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.validation.impl.YValidatorImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/util/ValidationAdapterFactory.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/util/ValidationAdapterFactory.java
index 3d89a19..8d09d73 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/util/ValidationAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/util/ValidationAdapterFactory.java
@@ -17,6 +17,7 @@
 import org.eclipse.osbp.ecview.core.common.model.core.YBindable;
 import org.eclipse.osbp.ecview.core.common.model.core.YElement;
 import org.eclipse.osbp.ecview.core.common.model.core.YTaggable;
+import org.eclipse.osbp.ecview.core.common.model.validation.*;
 import org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage;
 import org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidator;
 import org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidatorConfig;
@@ -112,6 +113,10 @@
 				return createYBeanValidationValidatorAdapter();
 			}
 			@Override
+			public Adapter caseYUniqueAttributeValidator(YUniqueAttributeValidator object) {
+				return createYUniqueAttributeValidatorAdapter();
+			}
+			@Override
 			public Adapter caseYValidationConfig(YValidationConfig object) {
 				return createYValidationConfigAdapter();
 			}
@@ -136,6 +141,10 @@
 				return createYBeanValidationValidatorConfigAdapter();
 			}
 			@Override
+			public Adapter caseYUniqueAttributeValidatorConfig(YUniqueAttributeValidatorConfig object) {
+				return createYUniqueAttributeValidatorConfigAdapter();
+			}
+			@Override
 			public Adapter caseYTaggable(YTaggable object) {
 				return createYTaggableAdapter();
 			}
@@ -252,6 +261,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidator <em>YUnique Attribute Validator</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.validation.YUniqueAttributeValidator
+	 * @generated
+	 */
+	public Adapter createYUniqueAttributeValidatorAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.validation.YValidationConfig <em>YValidation Config</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -336,6 +359,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.osbp.ecview.core.common.model.validation.YUniqueAttributeValidatorConfig <em>YUnique Attribute Validator Config</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.validation.YUniqueAttributeValidatorConfig
+	 * @generated
+	 */
+	public Adapter createYUniqueAttributeValidatorConfigAdapter() {
+		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;
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/util/ValidationSwitch.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/util/ValidationSwitch.java
index 5cae5af..a75e44f 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/util/ValidationSwitch.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/validation/util/ValidationSwitch.java
@@ -16,6 +16,7 @@
 import org.eclipse.osbp.ecview.core.common.model.core.YBindable;
 import org.eclipse.osbp.ecview.core.common.model.core.YElement;
 import org.eclipse.osbp.ecview.core.common.model.core.YTaggable;
+import org.eclipse.osbp.ecview.core.common.model.validation.*;
 import org.eclipse.osbp.ecview.core.common.model.validation.ValidationPackage;
 import org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidator;
 import org.eclipse.osbp.ecview.core.common.model.validation.YBeanValidationValidatorConfig;
@@ -68,7 +69,7 @@
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -156,6 +157,18 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case ValidationPackage.YUNIQUE_ATTRIBUTE_VALIDATOR: {
+				YUniqueAttributeValidator yUniqueAttributeValidator = (YUniqueAttributeValidator)theEObject;
+				T result = caseYUniqueAttributeValidator(yUniqueAttributeValidator);
+				if (result == null) result = caseYValidator(yUniqueAttributeValidator);
+				if (result == null) result = caseYUniqueAttributeValidatorConfig(yUniqueAttributeValidator);
+				if (result == null) result = caseYElement(yUniqueAttributeValidator);
+				if (result == null) result = caseYBindable(yUniqueAttributeValidator);
+				if (result == null) result = caseYValidationConfig(yUniqueAttributeValidator);
+				if (result == null) result = caseYTaggable(yUniqueAttributeValidator);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case ValidationPackage.YVALIDATION_CONFIG: {
 				YValidationConfig yValidationConfig = (YValidationConfig)theEObject;
 				T result = caseYValidationConfig(yValidationConfig);
@@ -197,6 +210,13 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case ValidationPackage.YUNIQUE_ATTRIBUTE_VALIDATOR_CONFIG: {
+				YUniqueAttributeValidatorConfig yUniqueAttributeValidatorConfig = (YUniqueAttributeValidatorConfig)theEObject;
+				T result = caseYUniqueAttributeValidatorConfig(yUniqueAttributeValidatorConfig);
+				if (result == null) result = caseYValidationConfig(yUniqueAttributeValidatorConfig);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -292,6 +312,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>YUnique Attribute Validator</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>YUnique Attribute Validator</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseYUniqueAttributeValidator(YUniqueAttributeValidator object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>YValidation Config</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -382,6 +417,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>YUnique Attribute Validator Config</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>YUnique Attribute Validator Config</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseYUniqueAttributeValidatorConfig(YUniqueAttributeValidatorConfig object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>YTaggable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YColor.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YColor.java
index 6476c64..8804bca 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YColor.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YColor.java
@@ -297,6 +297,8 @@
 	 * Returns the '<em><b>YColor</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YColor get(String literal) {
@@ -313,6 +315,8 @@
 	 * Returns the '<em><b>YColor</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YColor getByName(String name) {
@@ -329,6 +333,8 @@
 	 * Returns the '<em><b>YColor</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static YColor get(int value) {
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YVisibilityProcessor.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YVisibilityProcessor.java
index 9900760..28d1290 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YVisibilityProcessor.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YVisibilityProcessor.java
@@ -21,13 +21,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.YVisibilityProcessor#getDataUsed <em>Data Used</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.YVisibilityProcessor#getTriggersOn <em>Triggers On</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.YVisibilityProcessor#getDelegate <em>Delegate</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.YVisibilityProcessor#getDelegateQualifiedName <em>Delegate Qualified Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.visibility.VisibilityPackage#getYVisibilityProcessor()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YVisibilityProperties.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YVisibilityProperties.java
index 7c71d0f..94a2eba 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YVisibilityProperties.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/YVisibilityProperties.java
@@ -19,6 +19,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.YVisibilityProperties#isVisible <em>Visible</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.YVisibilityProperties#isEditable <em>Editable</em>}</li>
@@ -35,7 +36,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.YVisibilityProperties#getCssClass <em>Css Class</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.YVisibilityProperties#getCssId <em>Css Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.osbp.ecview.core.common.model.visibility.VisibilityPackage#getYVisibilityProperties()
  * @model
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/impl/YVisibilityProcessorImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/impl/YVisibilityProcessorImpl.java
index 15438b7..9ab121d 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/impl/YVisibilityProcessorImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/impl/YVisibilityProcessorImpl.java
@@ -37,6 +37,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.impl.YVisibilityProcessorImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.impl.YVisibilityProcessorImpl#getId <em>Id</em>}</li>
@@ -47,7 +48,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.impl.YVisibilityProcessorImpl#getDelegate <em>Delegate</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.impl.YVisibilityProcessorImpl#getDelegateQualifiedName <em>Delegate Qualified Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/impl/YVisibilityPropertiesImpl.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/impl/YVisibilityPropertiesImpl.java
index 35d7bba..af3fbb4 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/impl/YVisibilityPropertiesImpl.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/impl/YVisibilityPropertiesImpl.java
@@ -36,6 +36,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.impl.YVisibilityPropertiesImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.impl.YVisibilityPropertiesImpl#getId <em>Id</em>}</li>
@@ -56,7 +57,6 @@
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.impl.YVisibilityPropertiesImpl#getCssClass <em>Css Class</em>}</li>
  *   <li>{@link org.eclipse.osbp.ecview.core.common.model.visibility.impl.YVisibilityPropertiesImpl#getCssId <em>Css Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/util/VisibilitySwitch.java b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/util/VisibilitySwitch.java
index 7ae8a2d..e79b507 100644
--- a/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/util/VisibilitySwitch.java
+++ b/org.eclipse.osbp.ecview.core.common.model/src/org/eclipse/osbp/ecview/core/common/model/visibility/util/VisibilitySwitch.java
@@ -57,7 +57,7 @@
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/org.eclipse.osbp.ecview.core.common.tests/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.common.tests/META-INF/MANIFEST.MF
index 4639e01..000c9ae 100644
--- a/org.eclipse.osbp.ecview.core.common.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.common.tests/META-INF/MANIFEST.MF
@@ -11,9 +11,9 @@
  org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.ecview.core.extension.model;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.ecview.core.extension.editparts.emf;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.core.databinding.observable,
- org.eclipse.core.databinding.beans;bundle-version="1.2.200",
- org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding.beans;bundle-version="[1.3.100,1.4.0)",
+ org.eclipse.core.databinding;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.osbp.ecview.core.databinding.beans;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.ecview.core.databinding.emf;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.ecview.core.util.emf;bundle-version="[0.9.0,0.10.0)",
diff --git a/org.eclipse.osbp.ecview.core.common/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.common/META-INF/MANIFEST.MF
index 6706eb6..9cde9bc 100644
--- a/org.eclipse.osbp.ecview.core.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.common/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.apache.commons.beanutils;bundle-version="1.9.2",
- org.eclipse.core.databinding.observable;bundle-version="[1.4.1,1.5.0)",
- org.eclipse.core.databinding;bundle-version="[1.4.1,1.5.0)",
+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)",
  org.slf4j.api;bundle-version="1.7.2",
  org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)",
@@ -83,6 +83,7 @@
    org.eclipse.osbp.ecview.core.common,
    org.eclipse.osbp.ecview.core.common.context,
    org.eclipse.osbp.ecview.core.common.beans",
+ org.eclipse.osbp.ecview.core.common.util;version="0.9.0",
  org.eclipse.osbp.ecview.core.common.validation;version="0.9.0";uses:="org.eclipse.osbp.ecview.core.common.disposal,org.eclipse.osbp.ecview.core.common.context",
  org.eclipse.osbp.ecview.core.common.validation.impl;version="0.9.0";x-internal:=true,
  org.eclipse.osbp.ecview.core.common.visibility;version="0.9.0",
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/beans/AbstractSlot.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/beans/AbstractSlot.java
index a92bc12..7244fb9 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/beans/AbstractSlot.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/beans/AbstractSlot.java
@@ -13,6 +13,7 @@
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 
+import org.eclipse.osbp.runtime.common.bean.IdentityPropertyChangeSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,7 +21,7 @@
  * A default implementation of the slot. Offers {@link PropertyChangeSupport}.
  */
 public class AbstractSlot implements ISlot {
-	private final PropertyChangeSupport changeSupport = new PropertyChangeSupport(
+	private final IdentityPropertyChangeSupport changeSupport = new IdentityPropertyChangeSupport(
 			this);
 
 	@SuppressWarnings("unused")
@@ -123,18 +124,17 @@
 
 	@Override
 	public void setValue(Object value) {
-
 		if (this.value == value) {
 			return;
 		}
 
-		// workaround since PropertyChangeSupport does not send events if(value
-		// != this.value && this.value.equals(value))
-		// so we need to set this value to null first
-		if (this.value != null && this.value.equals(value)) {
-			// reset the value to null
-			firePropertyChanged("value", this.value, this.value = null);
-		}
+//		// workaround since PropertyChangeSupport does not send events if(value
+//		// != this.value && this.value.equals(value))
+//		// so we need to set this value to null first
+//		if (this.value != null && this.value.equals(value)) {
+//			// reset the value to null
+//			firePropertyChanged("value", this.value, this.value = null);
+//		}
 
 		firePropertyChanged("value", this.value, this.value = value);
 	}
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/context/ViewContext.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/context/ViewContext.java
index b3bdc26..eb38877 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/context/ViewContext.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/context/ViewContext.java
@@ -38,8 +38,7 @@
 public class ViewContext extends DisposableContext implements IViewContext {
 
 	/** The Constant logger. */
-	private static final Logger logger = LoggerFactory
-			.getLogger(ViewContext.class);
+	private static final Logger logger = LoggerFactory.getLogger(ViewContext.class);
 
 	/** The final dispose. */
 	// preparations for final disposal after view has been disposed
@@ -47,13 +46,13 @@
 
 	/** The visibility manager. */
 	private VisibilityManager visibilityManager;
-	
+
 	/** The view editpart. */
 	private IViewEditpart viewEditpart;
-	
+
 	/** The root layout. */
 	private Object rootLayout;
-	
+
 	/** The presentation uri. */
 	private String presentationURI;
 
@@ -68,9 +67,9 @@
 	 */
 	public ViewContext() {
 	}
-	
+
 	public void setViewEditpart(IViewEditpart viewEditpart) {
-		if(this.viewEditpart == null) {
+		if (this.viewEditpart == null) {
 			this.viewEditpart = viewEditpart;
 		}
 	}
@@ -101,20 +100,17 @@
 			registerService(selector, service);
 			return (S) service;
 		} else if (selector.equals(IWidgetMouseClickService.ID)) {
-			IWidgetMouseClickService service = getViewEditpart().createService(
-					IWidgetMouseClickService.class);
+			IWidgetMouseClickService service = getViewEditpart().createService(IWidgetMouseClickService.class);
 			registerService(selector, service);
 			return (S) service;
 		} else if (selector.equals(IWidgetAssocationsService.ID)) {
-			IWidgetAssocationsService<?, ?> service = getViewEditpart()
-					.createService(IWidgetAssocationsService.class);
+			IWidgetAssocationsService<?, ?> service = getViewEditpart().createService(IWidgetAssocationsService.class);
 			registerService(selector, service);
 			return (S) service;
 		} else {
 			if (thirdpartyServiceDelegate != null) {
 				if (thirdpartyServiceDelegate.isFor(selector, this)) {
-					Object service = thirdpartyServiceDelegate.createService(
-							selector, this);
+					Object service = thirdpartyServiceDelegate.createService(selector, this);
 					// do NOT register the service since another call may return
 					// a different service instance.
 					return (S) service;
@@ -152,8 +148,11 @@
 		return viewEditpart;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.context.IViewContext#getVisibilityManager()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.ecview.core.common.context.IViewContext#
+	 * getVisibilityManager()
 	 */
 	@Override
 	public IVisibilityManager getVisibilityManager() {
@@ -163,8 +162,11 @@
 		return visibilityManager;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.context.IViewContext#getExposedActions()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.ecview.core.common.context.IViewContext#
+	 * getExposedActions()
 	 */
 	@Override
 	public List<IExposedActionEditpart> getExposedActions() {
@@ -181,7 +183,9 @@
 		return rootLayout;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.eclipse.osbp.runtime.common.dispose.AbstractDisposable#dispose()
 	 */
 	@Override
@@ -195,8 +199,8 @@
 	 * {@inheritDoc}
 	 */
 	@Override
-	synchronized public void render(String presentationURI, Object rootLayout,
-			Map<String, Object> parameter) throws ContextException {
+	synchronized public void render(String presentationURI, Object rootLayout, Map<String, Object> parameter)
+			throws ContextException {
 		checkDisposed();
 
 		if (rootLayout == null) {
@@ -217,8 +221,7 @@
 
 			if (parameter != null) {
 				// Set the configuration
-				IConfiguration config = (IConfiguration) parameter
-						.get(IViewContext.PARAM_CONFIGURATION);
+				IConfiguration config = (IConfiguration) parameter.get(IViewContext.PARAM_CONFIGURATION);
 				if (config != null) {
 					editPart.setConfiguration(config);
 				}
@@ -229,10 +232,14 @@
 
 				// Register all services
 				@SuppressWarnings("unchecked")
-				Map<String, Object> services = (Map<String, Object>) parameter
-						.get(IViewContext.PARAM_SERVICES);
+				Map<String, Object> services = (Map<String, Object>) parameter.get(IViewContext.PARAM_SERVICES);
 				if (services != null) {
 					for (Map.Entry<String, Object> entry : services.entrySet()) {
+						if (thirdpartyServiceDelegate == null
+								&& entry.getKey().equals(IViewContext.PARAM_THIRDPARTY_SERVICE_PROVIDER)) {
+							thirdpartyServiceDelegate = (IThirdPartyServiceDelegate) entry.getValue();
+						}
+
 						registerService(entry.getKey(), entry.getValue());
 					}
 				}
@@ -241,12 +248,11 @@
 			// render the UI
 			editPart.render(parameter);
 
-			ILifecycleService lifecycleService = getService(ILifecycleService.class
-					.getName());
+			ILifecycleService lifecycleService = getService(ILifecycleService.class.getName());
 			// send event that context is disposed
 			if (lifecycleService != null) {
-				lifecycleService.notifyLifecycle(new LifecycleEvent(
-						getViewEditpart(), ILifecycleEvent.CONTEXT_CREATED));
+				lifecycleService
+						.notifyLifecycle(new LifecycleEvent(getViewEditpart(), ILifecycleEvent.CONTEXT_CREATED));
 			}
 		} catch (Exception ex) {
 			logger.error("{}", ex);
@@ -265,8 +271,12 @@
 		return rendered;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.context.IViewContext#exec(java.lang.Runnable)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.context.IViewContext#exec(java.lang.
+	 * Runnable)
 	 */
 	@Override
 	public void exec(Runnable runnable) {
@@ -275,8 +285,12 @@
 		getViewEditpart().exec(runnable);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.context.IViewContext#execAsync(java.lang.Runnable)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.context.IViewContext#execAsync(java.
+	 * lang.Runnable)
 	 */
 	@Override
 	public Future<?> execAsync(Runnable runnable) {
@@ -285,8 +299,11 @@
 		return getViewEditpart().execAsync(runnable);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.context.DisposableContext#updateLocale(java.util.Locale)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.osbp.ecview.core.common.context.DisposableContext#
+	 * updateLocale(java.util.Locale)
 	 */
 	@Override
 	protected void updateLocale(Locale locale) {
@@ -296,30 +313,41 @@
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.context.IViewContext#findModelElement(java.lang.String)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.context.IViewContext#findModelElement
+	 * (java.lang.String)
 	 */
 	@Override
 	public Object findModelElement(String id) {
 		return viewEditpart.findModelElement(id);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.context.IViewContext#findBoundField(java.lang.String)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.context.IViewContext#findBoundField(
+	 * java.lang.String)
 	 */
 	@Override
 	public Object findBoundField(String bindingIdRegex) {
 		return viewEditpart.findBoundField(bindingIdRegex);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osbp.ecview.core.common.context.DisposableContext#preDispose()
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.osbp.ecview.core.common.context.DisposableContext#preDispose(
+	 * )
 	 */
 	protected void preDispose() {
 		super.preDispose();
 
-		finalDispose.put(IWidgetAssocationsService.class.getName(),
-				getService(IWidgetAssocationsService.ID));
+		finalDispose.put(IWidgetAssocationsService.class.getName(), getService(IWidgetAssocationsService.ID));
 	}
 
 	/**
@@ -327,8 +355,7 @@
 	 */
 	@Override
 	public void internalDispose() {
-		ILifecycleService lifecycleService = getService(ILifecycleService.class
-				.getName());
+		ILifecycleService lifecycleService = getService(ILifecycleService.class.getName());
 		try {
 			viewEditpart.dispose();
 
@@ -336,7 +363,7 @@
 			@SuppressWarnings("rawtypes")
 			IWidgetAssocationsService service = (IWidgetAssocationsService) finalDispose
 					.get(IWidgetAssocationsService.ID);
-			if(service != null) {
+			if (service != null) {
 				service.clear();
 			}
 			finalDispose = null;
@@ -346,8 +373,8 @@
 
 			// send event that context is disposed
 			if (lifecycleService != null) {
-				lifecycleService.notifyLifecycle(new LifecycleEvent(
-						getViewEditpart(), ILifecycleEvent.CONTEXT_DISPOSED));
+				lifecycleService
+						.notifyLifecycle(new LifecycleEvent(getViewEditpart(), ILifecycleEvent.CONTEXT_DISPOSED));
 			}
 		}
 	}
@@ -355,14 +382,18 @@
 	/**
 	 * This service notifies interested parties about a locale change.
 	 */
-	public class LocaleChangedService extends AbstractDisposable implements
-			ILocaleChangedService {
+	public class LocaleChangedService extends AbstractDisposable implements ILocaleChangedService {
 
 		/** The listeners. */
 		private List<LocaleListener> listeners;
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService#addLocaleListener(org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService.LocaleListener)
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService#
+		 * addLocaleListener(org.eclipse.osbp.ecview.core.common.context.
+		 * ILocaleChangedService.LocaleListener)
 		 */
 		@Override
 		public void addLocaleListener(LocaleListener listener) {
@@ -377,8 +408,13 @@
 			}
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService#removeLocaleListener(org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService.LocaleListener)
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService#
+		 * removeLocaleListener(org.eclipse.osbp.ecview.core.common.context.
+		 * ILocaleChangedService.LocaleListener)
 		 */
 		@Override
 		public void removeLocaleListener(LocaleListener listener) {
@@ -391,22 +427,28 @@
 			listeners.remove(listener);
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService#notifyLocaleChanged(java.util.Locale)
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.eclipse.osbp.ecview.core.common.context.ILocaleChangedService#
+		 * notifyLocaleChanged(java.util.Locale)
 		 */
 		public void notifyLocaleChanged(Locale locale) {
 			if (listeners == null) {
 				return;
 			}
 
-			for (LocaleListener listener : listeners
-					.toArray(new LocaleListener[listeners.size()])) {
+			for (LocaleListener listener : listeners.toArray(new LocaleListener[listeners.size()])) {
 				listener.localeChanged(locale);
 			}
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.osbp.runtime.common.dispose.AbstractDisposable#internalDispose()
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see org.eclipse.osbp.runtime.common.dispose.AbstractDisposable#
+		 * internalDispose()
 		 */
 		@Override
 		protected void internalDispose() {
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/ILifecycleEvent.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/ILifecycleEvent.java
index 4d6b6d2..e19f3b0 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/ILifecycleEvent.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/ILifecycleEvent.java
@@ -26,6 +26,9 @@
  */
 public interface ILifecycleEvent {
 
+	
+	public static final String TYPE_RENDERING = "rendering";
+	
 	/**
 	 * If a new context was created and rendered.
 	 */
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/ILifecycleService.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/ILifecycleService.java
index 0dbf54e..58a82b5 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/ILifecycleService.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/ILifecycleService.java
@@ -20,6 +20,13 @@
 public interface ILifecycleService {
 
 	/**
+	 * Returns the state of the lifecycle. Following ILifecycleEvent#{STATES}.
+	 * 
+	 * @return
+	 */
+	String getState();
+
+	/**
 	 * Adds a handler to the service. Calling the method twice has no effect.
 	 *
 	 * @param handler
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/LifecycleService.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/LifecycleService.java
index 497e23f..65f612f 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/LifecycleService.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/notification/LifecycleService.java
@@ -15,15 +15,17 @@
 import java.util.Set;
 
 import org.eclipse.osbp.ecview.core.common.context.IViewContext;
+import org.eclipse.osbp.ecview.core.common.model.core.YView;
 import org.eclipse.osbp.runtime.common.event.IEventBroker;
 
 public class LifecycleService implements ILifecycleService {
 
-	private Set<ILifecycleHandler> handlers = Collections
-			.synchronizedSet(new HashSet<ILifecycleHandler>());
+	private Set<ILifecycleHandler> handlers = Collections.synchronizedSet(new HashSet<ILifecycleHandler>());
 
 	private final IEventBroker eventBroker;
 
+	private String state = ILifecycleEvent.TYPE_RENDERING;
+
 	/**
 	 * The constructor.
 	 * 
@@ -46,6 +48,7 @@
 
 	@Override
 	public void notifyLifecycle(ILifecycleEvent event) {
+
 		synchronized (handlers) {
 			for (ILifecycleHandler handler : handlers) {
 				handler.notifyLifecycle(event);
@@ -56,5 +59,17 @@
 		if (eventBroker != null) {
 			eventBroker.send(IViewContext.TOPIC_LIFECYCLE, event);
 		}
+
+		if (!(event.getEditpart().getModel() instanceof YView)) {
+			return;
+		}
+
+		state = event.getType();
+
+	}
+
+	@Override
+	public String getState() {
+		return state;
 	}
 }
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/services/IWidgetAssocationsService.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/services/IWidgetAssocationsService.java
index be525ab..fa93abf 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/services/IWidgetAssocationsService.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/services/IWidgetAssocationsService.java
@@ -47,6 +47,15 @@
 	MODEL getModelElement(String id);
 
 	/**
+	 * Returns the model element for the given order index within the layout.
+	 *
+	 * @param layoutIdx
+	 *            the layout index
+	 * @return the model element
+	 */
+	MODEL getModelElement(int layoutIdx);
+
+	/**
 	 * Returns the editpart for the given id.
 	 *
 	 * @param id
@@ -65,8 +74,7 @@
 	UI getWidget(MODEL modelElement);
 
 	/**
-	 * Associates the uiWidget with the given model element. One model element
-	 * can become assigned to different uiWidgets.
+	 * Associates the uiWidget with the given model element. One model element can become assigned to different uiWidgets.
 	 *
 	 * @param uiWidget
 	 *            the ui widget
diff --git a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/validation/IValidator.java b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/validation/IValidator.java
index 9830f28..f25a249 100644
--- a/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/validation/IValidator.java
+++ b/org.eclipse.osbp.ecview.core.common/src/org/eclipse/osbp/ecview/core/common/validation/IValidator.java
@@ -17,7 +17,6 @@
 import org.eclipse.osbp.runtime.common.i18n.II18nService;
 import org.eclipse.osbp.runtime.common.validation.IStatus;
 
-// TODO: Auto-generated Javadoc
 /**
  * A validator is used to validate the given value.
  */
diff --git a/org.eclipse.osbp.ecview.core.databinding.beans/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.databinding.beans/META-INF/MANIFEST.MF
index 5d05d80..552887c 100644
--- a/org.eclipse.osbp.ecview.core.databinding.beans/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.databinding.beans/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@
 Bundle-SymbolicName: org.eclipse.osbp.ecview.core.databinding.beans
 Bundle-Vendor: Eclipse OSBP
 Bundle-Version: 0.9.0.qualifier
-Require-Bundle: org.eclipse.core.databinding.beans;bundle-version="[1.2.200,1.5.0)",
- org.eclipse.core.databinding.observable;bundle-version="[1.4.1,1.5.0)",
- org.eclipse.core.databinding.property;bundle-version="[1.4.200,1.5.0)",
+Require-Bundle: org.eclipse.core.databinding.beans;bundle-version="[1.3.100,1.4.0)",
+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.osbp.ecview.core.common;bundle-version="[0.9.0,0.10.0)",
  org.apache.commons.beanutils;bundle-version="1.9.2"
 Service-Component: OSGI-INF/beanBindingDelegate.xml,
diff --git a/org.eclipse.osbp.ecview.core.databinding.emf/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.databinding.emf/META-INF/MANIFEST.MF
index 4f4985d..99517aa 100644
--- a/org.eclipse.osbp.ecview.core.databinding.emf/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.databinding.emf/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@
 Bundle-SymbolicName: org.eclipse.osbp.ecview.core.databinding.emf
 Bundle-Vendor: Eclipse OSBP
 Bundle-Version: 0.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.3.0,1.5.0)",
  org.eclipse.osbp.ecview.core.common;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.core.databinding.beans;bundle-version="[1.2.200,1.5.0)",
- org.eclipse.core.databinding.property;bundle-version="[1.4.200,1.5.0)",
+ org.eclipse.core.databinding.beans;bundle-version="[1.3.100,1.4.0)",
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,1.7.0)",
  com.ibm.icu,
  org.eclipse.core.runtime;bundle-version="3.10.0"
 Export-Package: org.eclipse.osbp.ecview.core.databinding.emf.common;
diff --git a/org.eclipse.osbp.ecview.core.databinding.emf/src/org/eclipse/osbp/ecview/core/databinding/emf/common/ECViewUpdateValueStrategy.java b/org.eclipse.osbp.ecview.core.databinding.emf/src/org/eclipse/osbp/ecview/core/databinding/emf/common/ECViewUpdateValueStrategy.java
index 541648d..8fddb81 100644
--- a/org.eclipse.osbp.ecview.core.databinding.emf/src/org/eclipse/osbp/ecview/core/databinding/emf/common/ECViewUpdateValueStrategy.java
+++ b/org.eclipse.osbp.ecview.core.databinding.emf/src/org/eclipse/osbp/ecview/core/databinding/emf/common/ECViewUpdateValueStrategy.java
@@ -17,7 +17,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.core.databinding.BindingException;
 import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.util.Policy;
+import org.eclipse.core.internal.databinding.Activator;
 import org.eclipse.core.internal.databinding.conversion.NumberToBigDecimalConverter;
 import org.eclipse.core.internal.databinding.conversion.NumberToBigIntegerConverter;
 import org.eclipse.core.internal.databinding.conversion.NumberToByteConverter;
@@ -27,6 +30,8 @@
 import org.eclipse.core.internal.databinding.conversion.NumberToLongConverter;
 import org.eclipse.core.internal.databinding.conversion.NumberToShortConverter;
 import org.eclipse.core.internal.databinding.conversion.ObjectToStringConverter;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.databinding.EMFUpdateValueStrategy;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EDataType;
@@ -62,14 +67,10 @@
 		converterMap.put(new ConverterKey(Number.class, Float.TYPE),
 				new NumberToFloatConverter(numberFormat, Number.class, true));
 
-		converterMap
-				.put(new ConverterKey(Number.class, Integer.class),
-						new NumberToIntegerConverter(integerFormat,
-								Number.class, false));
-		converterMap
-				.put(new ConverterKey(Number.class, Integer.TYPE),
-						new NumberToIntegerConverter(integerFormat,
-								Number.class, true));
+		converterMap.put(new ConverterKey(Number.class, Integer.class),
+				new NumberToIntegerConverter(integerFormat, Number.class, false));
+		converterMap.put(new ConverterKey(Number.class, Integer.TYPE),
+				new NumberToIntegerConverter(integerFormat, Number.class, true));
 
 		converterMap.put(new ConverterKey(Number.class, Long.class),
 				new NumberToLongConverter(integerFormat, Number.class, false));
@@ -106,15 +107,13 @@
 			final EAttribute toEAttribute = (EAttribute) toType;
 
 			if (isNumber(fromEAttribute) && isNumber(toEAttribute)) {
-				final EDataType fromEDataType = fromEAttribute
-						.getEAttributeType();
+				final EDataType fromEDataType = fromEAttribute.getEAttributeType();
 				final Class<?> fromTypeClass = fromEDataType.getInstanceClass();
 
 				final EDataType toEDataType = toEAttribute.getEAttributeType();
 				final Class<?> toTypeClass = toEDataType.getInstanceClass();
 
-				IConverter converter = findNumberToNumberConverter(toTypeClass,
-						fromTypeClass);
+				IConverter converter = findNumberToNumberConverter(toTypeClass, fromTypeClass);
 				if (converter != null) {
 					return converter;
 				}
@@ -131,16 +130,16 @@
 			if (isNumber(fromType)) {
 				if (isNumber(toTypeClass)) {
 					final Class<?> fromTypeClass = (Class<?>) fromType;
-					IConverter converter = findNumberToNumberConverter(
-							toTypeClass, fromTypeClass);
+					IConverter converter = findNumberToNumberConverter(toTypeClass, fromTypeClass);
 					if (converter != null) {
 						return converter;
 					}
 				} else if (toTypeClass == String.class) {
 					return new ObjectToStringConverter();
 				}
-			} else if (fromType == String.class
-					&& (toTypeClass == String.class || toTypeClass == Object.class)) {
+			} else if (isBoolean(eAttribute)) {
+				return new BooleanConverter((Boolean) eAttribute.getDefaultValue());
+			} else if (fromType == String.class && (toTypeClass == String.class || toTypeClass == Object.class)) {
 				return null;
 			}
 		} else if (fromType instanceof EAttribute) {
@@ -151,14 +150,12 @@
 				// if eAttribute == number
 				if (isNumber(fromTypeClass)) {
 					final Class<?> toTypeClass = (Class<?>) toType;
-					IConverter converter = findNumberToNumberConverter(
-							toTypeClass, fromTypeClass);
+					IConverter converter = findNumberToNumberConverter(toTypeClass, fromTypeClass);
 					if (converter != null) {
 						return converter;
 					}
 				}
-			} else if (toType == String.class
-					&& (fromTypeClass == String.class || fromTypeClass == Object.class)) {
+			} else if (toType == String.class && (fromTypeClass == String.class || fromTypeClass == Object.class)) {
 				return null;
 			}
 		}
@@ -166,14 +163,38 @@
 	}
 
 	/**
+	 * Converts the value from the source type to the destination type.
+	 * <p>
+	 * Default implementation will use the setConverter(IConverter), if one
+	 * exists. If no converter exists no conversion occurs.
+	 * </p>
+	 *
+	 * @param value
+	 * @return the converted value
+	 */
+	public Object convert(Object value) {
+		if (converter != null) {
+			try {
+				return converter.convert(value);
+				// TODO We should think about validators in ECView
+			} catch (BindingException ex) {
+				return null;
+			} catch (Exception ex) {
+				Policy.getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getMessage(), ex));
+				return null;
+			}
+		}
+		return value;
+	}
+
+	/**
 	 * Tries to find a proper number converter.
 	 * 
 	 * @param toTypeClass
 	 * @param fromTypeClass
 	 * @return
 	 */
-	private IConverter findNumberToNumberConverter(final Class<?> toTypeClass,
-			final Class<?> fromTypeClass) {
+	private IConverter findNumberToNumberConverter(final Class<?> toTypeClass, final Class<?> fromTypeClass) {
 		// if (toTypeClass == BigDecimal.class)
 		// return new NumberToBigDecimalConverter(
 		// NumberFormat.getNumberInstance(), fromTypeClass);
@@ -211,8 +232,15 @@
 	 * @return
 	 */
 	private boolean isNumber(Object type) {
-		return type instanceof Class
-				&& (((Class<?>) type).isAssignableFrom(Number.class) || isPrimitiveNumber((Class<?>) type));
+		if(type instanceof Class<?>) {
+			Class<?> clazz = (Class<?>) type;
+			return Number.class.isAssignableFrom(clazz) || isPrimitiveNumber((Class<?>) type);
+		}
+		return false;
+	}
+
+	private boolean isBoolean(Object type) {
+		return type == Boolean.class || type == Boolean.TYPE;
 	}
 
 	private boolean isNumber(EAttribute eAttribute) {
@@ -221,6 +249,12 @@
 		return isNumber(fromTypeClass);
 	}
 
+	private boolean isBoolean(EAttribute eAttribute) {
+		final EDataType eDataType = eAttribute.getEAttributeType();
+		final Class<?> fromTypeClass = eDataType.getInstanceClass();
+		return isBoolean(fromTypeClass);
+	}
+
 	/**
 	 * Returns true, if the given type is a date.
 	 * 
@@ -229,8 +263,7 @@
 	 */
 	@SuppressWarnings("unused")
 	private boolean isDate(Object type) {
-		return type instanceof Class
-				&& (((Class<?>) type).isAssignableFrom(Date.class));
+		return type instanceof Class && (Date.class.isAssignableFrom((Class<?>) type));
 	}
 
 	/**
@@ -252,8 +285,7 @@
 	 */
 	private boolean isPrimitiveNumber(Class<?> type) {
 		if (type.isPrimitive()) {
-			return type == Short.TYPE || type == Byte.TYPE
-					|| type == Double.TYPE || type == Float.TYPE
+			return type == Short.TYPE || type == Byte.TYPE || type == Double.TYPE || type == Float.TYPE
 					|| type == Integer.TYPE || type == Long.TYPE;
 		}
 		return false;
@@ -277,10 +309,8 @@
 		public int hashCode() {
 			final int prime = 31;
 			int result = 1;
-			result = prime * result
-					+ ((fromType == null) ? 0 : fromType.hashCode());
-			result = prime * result
-					+ ((toType == null) ? 0 : toType.hashCode());
+			result = prime * result + ((fromType == null) ? 0 : fromType.hashCode());
+			result = prime * result + ((toType == null) ? 0 : toType.hashCode());
 			return result;
 		}
 
@@ -308,4 +338,33 @@
 
 	}
 
+	private static class BooleanConverter implements IConverter {
+
+		final Boolean defaultValue;
+
+		public BooleanConverter(Boolean defaultValue) {
+			this.defaultValue = defaultValue;
+		}
+
+		@Override
+		public Object getFromType() {
+			return Boolean.class;
+		}
+
+		@Override
+		public Object getToType() {
+			return Boolean.class;
+		}
+
+		@Override
+		public Object convert(Object fromObject) {
+			return fromObject != null ? fromObject : toDefault();
+		}
+
+		private Boolean toDefault() {
+			return defaultValue != null ? defaultValue : Boolean.FALSE;
+		}
+
+	}
+
 }
diff --git a/org.eclipse.osbp.ecview.core.databinding.tests/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.databinding.tests/META-INF/MANIFEST.MF
index f0acb72..24d17f4 100644
--- a/org.eclipse.osbp.ecview.core.databinding.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.databinding.tests/META-INF/MANIFEST.MF
@@ -16,11 +16,11 @@
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.osbp.ecview.core.databinding.emf;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.core.databinding.beans;bundle-version="1.2.200",
- org.eclipse.core.databinding.observable;bundle-version="1.4.1",
- org.eclipse.core.databinding.property;bundle-version="1.4.200",
- org.eclipse.emf.databinding;bundle-version="1.3.0",
+ org.eclipse.core.databinding;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding.beans;bundle-version="[1.3.100,1.4.0)",
+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.emf.databinding;bundle-version="[1.6.0,1.7.0)",
  org.apache.commons.beanutils;bundle-version="1.9.2",
  org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.osbp.ecview.core.emf.api/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.emf.api/META-INF/MANIFEST.MF
index e781026..b1c9a29 100644
--- a/org.eclipse.osbp.ecview.core.emf.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.emf.api/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
  org.eclipse.osbp.ecview.core.extension.model;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.slf4j;version="1.6.4"
 Export-Package: org.eclipse.osbp.ecview.core.emf.api;
   uses:="org.eclipse.osbp.ecview.core.common.editpart.binding,
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/.project b/org.eclipse.osbp.ecview.core.extension.editparts.emf/.project
index 32090ed..dd7f8aa 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/.project
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/.project
@@ -6,12 +6,17 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -35,16 +40,6 @@
 			<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>
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.extension.editparts.emf/META-INF/MANIFEST.MF
index 6bb0636..27879ed 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/META-INF/MANIFEST.MF
@@ -12,16 +12,15 @@
  org.eclipse.osbp.ecview.core.extension.model;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.ecview.core.common;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.core.databinding.observable;bundle-version="[1.4.1,1.5.0)",
- org.eclipse.core.databinding.beans;bundle-version="[1.2.200,1.5.0)",
- org.eclipse.core.databinding;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding.beans;bundle-version="[1.3.100,1.4.0)",
+ org.eclipse.core.databinding;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)",
  org.slf4j.api;bundle-version="1.7.2"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.osgi.service.component;version="1.2.0",
  org.osgi.service.component.annotations;version="1.2.0"
-Service-Component: OSGI-INF/editPartManager.xml,
- OSGI-INF/org.eclipse.osbp.ecview.core.extension.editpart.emf.EditpartManager.xml
+Service-Component: OSGI-INF/*.xml
 Export-Package: org.eclipse.osbp.ecview.core.extension.editpart.emf;x-internal:="true";version="0.9.0",
  org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;x-internal:="true";version="0.9.0"
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/AbsoluteLayoutEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/AbsoluteLayoutEditpart.java
index 6d54f94..e98384d 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/AbsoluteLayoutEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/AbsoluteLayoutEditpart.java
@@ -17,7 +17,6 @@
 import org.eclipse.osbp.ecview.core.common.context.IViewContext;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YAbsoluteLayout;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YAbsoluteLayoutCellStyle;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IAbsoluteLayoutEditpart;
@@ -25,7 +24,6 @@
 /**
  * The implementation of the IUigridLayoutEditpart.
  */
-@SuppressWarnings("unchecked")
 public class AbsoluteLayoutEditpart extends LayoutEditpart<YAbsoluteLayout>
 		implements IAbsoluteLayoutEditpart {
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BeanReferenceFieldEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BeanReferenceFieldEditpart.java
index a440e3b..fbd87b1 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BeanReferenceFieldEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BeanReferenceFieldEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YBeanReferenceField;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IBeanReferenceFieldEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BooleanSearchFieldEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BooleanSearchFieldEditpart.java
index 4bbeee2..27c1c25 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BooleanSearchFieldEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BooleanSearchFieldEditpart.java
@@ -12,7 +12,6 @@
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
 import org.eclipse.osbp.ecview.core.common.filter.IFilterProvidingPresentation;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YBooleanSearchField;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IBooleanSearchFieldEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BrowserEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BrowserEditpart.java
index 575e721..07a7fc0 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BrowserEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/BrowserEditpart.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.EmbeddableEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.validation.IValidatorEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YBrowser;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IBrowserEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/CheckBoxEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/CheckBoxEditpart.java
index ab55a2a..f35135f 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/CheckBoxEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/CheckBoxEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YCheckBox;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ICheckboxEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ComboBoxEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ComboBoxEditpart.java
index f9d3228..bbbced6 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ComboBoxEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ComboBoxEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YComboBox;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IComboBoxEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/CssLayoutEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/CssLayoutEditpart.java
index 4a0ab73..125faf7 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/CssLayoutEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/CssLayoutEditpart.java
@@ -11,14 +11,12 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YCssLayout;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ICssLayoutEditpart;
 
 /**
  * The implementation of the IUigridLayoutEditpart.
  */
-@SuppressWarnings("unchecked")
 public class CssLayoutEditpart extends LayoutEditpart<YCssLayout> implements ICssLayoutEditpart {
 
 }
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/DateTimeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/DateTimeEditpart.java
index 7a90d4f..12aa57a 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/DateTimeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/DateTimeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YDateTime;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IDateTimeEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/DecimalFieldEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/DecimalFieldEditpart.java
index 8a425d5..63d6075 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/DecimalFieldEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/DecimalFieldEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YDecimalField;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IDecimalFieldEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EditpartManager.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EditpartManager.java
index f7482c2..2bdbd38 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EditpartManager.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EditpartManager.java
@@ -63,10 +63,13 @@
 import org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YEnumList;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YEnumOptionsGroup;
+import org.eclipse.osbp.ecview.core.extension.model.extension.YFilteringComponent;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YFormLayout;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YGridLayout;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YHorizontalLayout;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YImage;
+import org.eclipse.osbp.ecview.core.extension.model.extension.YKanban;
+import org.eclipse.osbp.ecview.core.extension.model.extension.YKanbanVisibilityProcessor;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YLabel;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YList;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YMasterDetail;
@@ -111,161 +114,14 @@
 	@Override
 	public boolean isFor(Object element) {
 		if (element instanceof EObject) {
-			String uriString = ((EObject) element).eClass().getEPackage()
-					.getNsURI();
-			return uriString.equals(ExtensionModelPackage.eNS_URI)
-					|| uriString.equals(ExtDatatypesPackage.eNS_URI);
+			String uriString = ((EObject) element).eClass().getEPackage().getNsURI();
+			return uriString.equals(ExtensionModelPackage.eNS_URI) || uriString.equals(ExtDatatypesPackage.eNS_URI);
 		} else if (element instanceof String) {
-			return element.equals(ExtensionModelPackage.eNS_URI)
-					|| element.equals(ExtDatatypesPackage.eNS_URI);
+			return element.equals(ExtensionModelPackage.eNS_URI) || element.equals(ExtDatatypesPackage.eNS_URI);
 		}
 		return false;
 	}
 
-	// @SuppressWarnings("unchecked")
-	// @Override
-	// public <A extends IElementEditpart> A createEditpart(IViewContext
-	// context, Object selector,
-	// Class<A> editPartClazz) {
-	// ElementEditpart<YElement> result = null;
-	// if (editPartClazz.isAssignableFrom(ITextFieldEditpart.class)) {
-	// result = createNewInstance(TextFieldEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IGridLayoutEditpart.class)) {
-	// result = createNewInstance(GridLayoutEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ICssLayoutEditpart.class)) {
-	// result = createNewInstance(CssLayoutEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IHorizontalLayoutEditpart.class)) {
-	// result = createNewInstance(HorizontalLayoutEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IVerticalLayoutEditpart.class)) {
-	// result = createNewInstance(VerticalLayoutEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IFormLayoutEditpart.class)) {
-	// result = createNewInstance(FormLayoutEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IListEditpart.class)) {
-	// result = createNewInstance(ListEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ITableEditpart.class)) {
-	// result = createNewInstance(TableEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ITreeEditpart.class)) {
-	// result = createNewInstance(TreeEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IOptionsGroupEditpart.class)) {
-	// result = createNewInstance(OptionsGroupEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ILabelEditpart.class)) {
-	// result = createNewInstance(LabelEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ITextAreaEditpart.class)) {
-	// result = createNewInstance(TextAreaEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IButtonEditpart.class)) {
-	// result = createNewInstance(ButtonEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ICheckboxEditpart.class)) {
-	// result = createNewInstance(CheckBoxEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(INumericFieldEditpart.class)) {
-	// result = createNewInstance(NumericFieldEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IDecimalFieldEditpart.class)) {
-	// result = createNewInstance(DecimalFieldEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IBrowserEditpart.class)) {
-	// result = createNewInstance(BrowserEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IDateTimeEditpart.class)) {
-	// result = createNewInstance(DateTimeEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IProgressBarEditpart.class)) {
-	// result = createNewInstance(ProgressBarEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ITabSheetEditpart.class)) {
-	// result = createNewInstance(TabSheetEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ITabEditpart.class)) {
-	// result = createNewInstance(TabEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IBrowserDatatypeEditpart.class)) {
-	// result = createNewInstance(BrowserDatatypeEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(ICheckBoxDatatypeEditpart.class)) {
-	// result = createNewInstance(CheckBoxDatatypeEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IComboBoxDatatypeEditpart.class)) {
-	// result = createNewInstance(ComboBoxDatatypeEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IDateTimeDatatypeEditpart.class)) {
-	// result = createNewInstance(DateTimeDatatypeEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IDecimalDatatypeEditpart.class)) {
-	// result = createNewInstance(DecimalDatatypeEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IListDatatypeEditpart.class)) {
-	// result = createNewInstance(ListDatatypeEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(INumericDatatypeEditpart.class)) {
-	// result = createNewInstance(NumericDatatypeEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IOptionsGroupDatatypeEditpart.class)) {
-	// result = createNewInstance(OptionsGroupDatatypeEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IProgressBarDatatypeEditpart.class)) {
-	// result = createNewInstance(ProgressBarDatatypeEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ITableDatatypeEditpart.class))
-	// {
-	// result = createNewInstance(TableDatatypeEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(ITabSheetDatatypeEditpart.class)) {
-	// result = createNewInstance(TabSheetDatatypeEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(ITextAreaDatatypeEditpart.class)) {
-	// result = createNewInstance(TextAreaEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ITextDatatypeEditpart.class)) {
-	// result = createNewInstance(TextDatatypeEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ITreeDatatypeEditpart.class)) {
-	// result = createNewInstance(TreeDatatypeEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IMasterDetailEditpart.class)) {
-	// result = createNewInstance(MasterDetailEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IImageEditpart.class)) {
-	// result = createNewInstance(ImageEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(ITextSearchFieldEditpart.class)) {
-	// result = createNewInstance(TextSearchFieldEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(INumericSearchFieldEditpart.class)) {
-	// result = createNewInstance(NumericSearchFieldEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IBooleanSearchFieldEditpart.class)) {
-	// result = createNewInstance(BooleanSearchFieldEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ISplitPanelEditpart.class)) {
-	// result = createNewInstance(SplitPanelEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IPanelEditpart.class)) {
-	// result = createNewInstance(PanelEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ISearchPanelEditpart.class)) {
-	// result = createNewInstance(SearchPanelEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IBeanReferenceFieldEditpart.class)) {
-	// result = createNewInstance(BeanReferenceFieldEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IEnumComboBoxEditpart.class)) {
-	// result = createNewInstance(EnumComboBoxEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(IEnumListEditpart.class)) {
-	// result = createNewInstance(EnumListEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IEnumOptionsGroupEditpart.class)) {
-	// result = createNewInstance(EnumOptionsGroupEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IAddToTableCommandEditpart.class)) {
-	// result = createNewInstance(AddToTableEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IRemoveFromTableCommandEditpart.class)) {
-	// result = createNewInstance(RemoveFromTableEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(ISetNewInstanceCommandEditpart.class)) {
-	// result = createNewInstance(SetNewBeanInstanceEditpart.class);
-	// } else if (editPartClazz.isAssignableFrom(ISliderEditpart.class)) {
-	// result = createNewInstance(SliderEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(IAbsoluteLayoutEditpart.class)) {
-	// result = createNewInstance(AbsoluteLayoutEditpart.class);
-	// } else if (editPartClazz
-	// .isAssignableFrom(ISuggestTextFieldEditpart.class)) {
-	// result = createNewInstance(SuggestTextFieldEditpart.class);
-	// }
-	//
-	// if (result != null) {
-	// result.initialize();
-	// }
-	//
-	// return (A) result;
-	// }
-
 	/**
 	 * Creates a new instance of the edit part.
 	 * 
@@ -276,8 +132,7 @@
 	 * @return editpart
 	 */
 	@SuppressWarnings("unchecked")
-	protected <A extends IElementEditpart> A createEditpart(
-			IViewContext context, Object yElement) {
+	protected <A extends IElementEditpart> A createEditpart(IViewContext context, Object yElement) {
 		// asserts that no editpart was created already for the given element
 		assertOneEditpartForModelelement(yElement);
 
@@ -392,6 +247,12 @@
 			result = createNewInstance(SuggestTextFieldEditpart.class);
 		} else if (yElement instanceof YPasswordField) {
 			result = createNewInstance(PasswordFieldEditpart.class);
+		} else if (yElement instanceof YFilteringComponent) {
+			result = createNewInstance(FilteringComponentEditpart.class);
+		} else if (yElement instanceof YKanban) {
+			result = createNewInstance(KanbanEditpart.class);
+		} else if (yElement instanceof YKanbanVisibilityProcessor) {
+			result = createNewInstance(KanbanVisibilityProcessorEditpart.class);
 		}
 
 		if (result != null) {
@@ -413,8 +274,7 @@
 	 * @throws IllegalAccessException
 	 *             e
 	 */
-	protected IElementEditpart newInstance(
-			Class<? extends IElementEditpart> type)
+	protected IElementEditpart newInstance(Class<? extends IElementEditpart> type)
 			throws InstantiationException, IllegalAccessException {
 		return type.newInstance();
 	}
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumComboBoxEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumComboBoxEditpart.java
index 457185c..2b46981 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumComboBoxEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumComboBoxEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YEnumComboBox;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IEnumComboBoxEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumListEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumListEditpart.java
index bb27040..25838a6 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumListEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumListEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YEnumList;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IEnumListEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumOptionsGroupEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumOptionsGroupEditpart.java
index 55afaf0..3229c6b 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumOptionsGroupEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/EnumOptionsGroupEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YEnumOptionsGroup;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IEnumOptionsGroupEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/FormLayoutEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/FormLayoutEditpart.java
index b106c08..5fccd2b 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/FormLayoutEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/FormLayoutEditpart.java
@@ -17,7 +17,6 @@
 import org.eclipse.osbp.ecview.core.common.context.IViewContext;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YAbsoluteLayoutCellStyle;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YFormLayout;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YFormLayoutCellStyle;
@@ -26,7 +25,6 @@
 /**
  * The implementation of the IUigridLayoutEditpart.
  */
-@SuppressWarnings("unchecked")
 public class FormLayoutEditpart extends LayoutEditpart<YFormLayout> implements
 		IFormLayoutEditpart {
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/GridLayoutEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/GridLayoutEditpart.java
index 4cbf120..baa119f 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/GridLayoutEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/GridLayoutEditpart.java
@@ -18,7 +18,6 @@
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable;
 import org.eclipse.osbp.ecview.core.common.presentation.ILayoutPresentation;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YAbsoluteLayoutCellStyle;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YGridLayout;
@@ -28,7 +27,6 @@
 /**
  * The implementation of the IUigridLayoutEditpart.
  */
-@SuppressWarnings("unchecked")
 public class GridLayoutEditpart extends LayoutEditpart<YGridLayout> implements
 		IGridLayoutEditpart {
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/HorizontalLayoutEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/HorizontalLayoutEditpart.java
index b803564..4139c42 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/HorizontalLayoutEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/HorizontalLayoutEditpart.java
@@ -17,11 +17,7 @@
 import org.eclipse.osbp.ecview.core.common.context.IViewContext;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable;
-import org.eclipse.osbp.ecview.core.extension.editpart.emf.GridLayoutEditpart.StylesController;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YAbsoluteLayoutCellStyle;
-import org.eclipse.osbp.ecview.core.extension.model.extension.YGridLayout;
-import org.eclipse.osbp.ecview.core.extension.model.extension.YGridLayoutCellStyle;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YHorizontalLayout;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YHorizontalLayoutCellStyle;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IHorizontalLayoutEditpart;
@@ -29,7 +25,6 @@
 /**
  * The implementation of the IUigridLayoutEditpart.
  */
-@SuppressWarnings("unchecked")
 public class HorizontalLayoutEditpart extends LayoutEditpart<YHorizontalLayout> implements IHorizontalLayoutEditpart {
 
 	private StylesController stylesController;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ImageEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ImageEditpart.java
index ba84915..be1d481 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ImageEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ImageEditpart.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.EmbeddableEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.validation.IValidatorEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YImage;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IImageEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/LabelEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/LabelEditpart.java
index 9c10bcf..1bc4a82 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/LabelEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/LabelEditpart.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.EmbeddableEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.validation.IValidatorEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YLabel;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ILabelEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ListEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ListEditpart.java
index 533a3be..a72388c 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ListEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ListEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YList;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IListEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/MasterDetailEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/MasterDetailEditpart.java
index a4b07a7..ae374a0 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/MasterDetailEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/MasterDetailEditpart.java
@@ -20,7 +20,6 @@
 import org.eclipse.osbp.ecview.core.common.editpart.validation.IValidatorEditpart;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable;
 import org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YMasterDetail;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IMasterDetailEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/NumericFieldEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/NumericFieldEditpart.java
index 3ff8273..f6fa52e 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/NumericFieldEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/NumericFieldEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YNumericField;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.INumericFieldEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/NumericSearchFieldEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/NumericSearchFieldEditpart.java
index af05a7b..9f595b2 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/NumericSearchFieldEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/NumericSearchFieldEditpart.java
@@ -12,7 +12,6 @@
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
 import org.eclipse.osbp.ecview.core.common.filter.IFilterProvidingPresentation;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YNumericSearchField;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.INumericSearchFieldEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/OptionsGroupEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/OptionsGroupEditpart.java
index d1195f7..ee6b12c 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/OptionsGroupEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/OptionsGroupEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YOptionsGroup;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IOptionsGroupEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/PanelEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/PanelEditpart.java
index 085ebc2..2c2f997 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/PanelEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/PanelEditpart.java
@@ -11,14 +11,12 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YPanel;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IPanelEditpart;
 
 /**
  * The implementation of the IUigridLayoutEditpart.
  */
-@SuppressWarnings("unchecked")
 public class PanelEditpart extends LayoutEditpart<YPanel> implements IPanelEditpart {
 
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ProgressBarEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ProgressBarEditpart.java
index e77bdc8..4878339 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ProgressBarEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/ProgressBarEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YProgressBar;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IProgressBarEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SearchPanelEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SearchPanelEditpart.java
index 26577d5..b63bbea 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SearchPanelEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SearchPanelEditpart.java
@@ -13,7 +13,6 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
 import org.eclipse.osbp.ecview.core.common.filter.IFilterProvidingPresentation;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YSearchPanel;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ISearchPanelEditpart;
@@ -21,7 +20,6 @@
 /**
  * The implementation of the ISearchPanelEditpart.
  */
-@SuppressWarnings("unchecked")
 public class SearchPanelEditpart extends LayoutEditpart<YSearchPanel> implements
 		ISearchPanelEditpart {
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SliderEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SliderEditpart.java
index 3178446..68088f6 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SliderEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SliderEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YSlider;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ISliderEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SplitPanelEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SplitPanelEditpart.java
index 6068df4..3986013 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SplitPanelEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SplitPanelEditpart.java
@@ -11,11 +11,9 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YSplitPanel;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ISplitPanelEditpart;
 
-@SuppressWarnings("unchecked")
 public class SplitPanelEditpart extends LayoutEditpart<YSplitPanel> implements
 		ISplitPanelEditpart {
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SuggestTextFieldEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SuggestTextFieldEditpart.java
index b7b3aab..fc2c7ff 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SuggestTextFieldEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/SuggestTextFieldEditpart.java
@@ -14,7 +14,6 @@
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
 import org.eclipse.osbp.ecview.core.common.notification.IReloadRequestService;
 import org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YSuggestTextField;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ISuggestTextFieldEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TabEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TabEditpart.java
index d0a5267..c4e6582 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TabEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TabEditpart.java
@@ -16,7 +16,6 @@
 import org.eclipse.osbp.ecview.core.common.model.core.YView;
 import org.eclipse.osbp.ecview.core.common.presentation.DelegatingPresenterFactory;
 import org.eclipse.osbp.ecview.core.common.presentation.IWidgetPresentation;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTab;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTabSheet;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ITabEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TabSheetEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TabSheetEditpart.java
index ac5789f..27de89a 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TabSheetEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TabSheetEditpart.java
@@ -18,7 +18,6 @@
 import org.eclipse.osbp.ecview.core.common.editpart.emf.EmbeddableEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.validation.IValidatorEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTab;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTabSheet;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TableEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TableEditpart.java
index ca9da51..2f51135 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TableEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TableEditpart.java
@@ -16,7 +16,6 @@
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
 import org.eclipse.osbp.ecview.core.common.filter.IFilterablePresentation;
 import org.eclipse.osbp.ecview.core.common.filter.IRefreshRowsPresentation;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTable;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ITableEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TextAreaEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TextAreaEditpart.java
index 512d916..6bcad25 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TextAreaEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TextAreaEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTextArea;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ITextAreaEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TextSearchFieldEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TextSearchFieldEditpart.java
index e1ececd..81059db 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TextSearchFieldEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TextSearchFieldEditpart.java
@@ -12,7 +12,6 @@
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
 import org.eclipse.osbp.ecview.core.common.filter.IFilterProvidingPresentation;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTextSearchField;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ITextSearchFieldEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TreeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TreeEditpart.java
index e742a63..95a6cbb 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TreeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/TreeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.FieldEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTree;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.ITreeEditpart;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/VerticalLayoutEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/VerticalLayoutEditpart.java
index 81132a9..c546fb7 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/VerticalLayoutEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/VerticalLayoutEditpart.java
@@ -17,16 +17,14 @@
 import org.eclipse.osbp.ecview.core.common.context.IViewContext;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.LayoutEditpart;
 import org.eclipse.osbp.ecview.core.common.model.core.YEmbeddable;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YAbsoluteLayoutCellStyle;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YVerticalLayout;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YVerticalLayoutCellStyle;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.IVerticalLayoutEditpart;
 
 /**
- * The implementation of the IUigridLayoutEditpart.
+ * The implementation of the IVerticalLayoutEditpart.
  */
-@SuppressWarnings("unchecked")
 public class VerticalLayoutEditpart extends LayoutEditpart<YVerticalLayout>
 		implements IVerticalLayoutEditpart {
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/AddToTableEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/AddToTableEditpart.java
index d4d43c2..d1778d3 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/AddToTableEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/AddToTableEditpart.java
@@ -17,7 +17,6 @@
 import org.eclipse.osbp.ecview.core.common.binding.IECViewBindingManager;
 import org.eclipse.osbp.ecview.core.common.editpart.binding.IBindableValueEndpointEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.CommandEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YAddToTableCommand;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YSelectionType;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTable;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/RemoveFromTableEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/RemoveFromTableEditpart.java
index e4b028b..ab8d689 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/RemoveFromTableEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/RemoveFromTableEditpart.java
@@ -19,7 +19,6 @@
 import org.eclipse.osbp.ecview.core.common.binding.IECViewBindingManager;
 import org.eclipse.osbp.ecview.core.common.editpart.binding.IBindableValueEndpointEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.CommandEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YRemoveFromTableCommand;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YSelectionType;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YTable;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/SetNewBeanInstanceEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/SetNewBeanInstanceEditpart.java
index a49403c..b299b9f 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/SetNewBeanInstanceEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/commands/SetNewBeanInstanceEditpart.java
@@ -17,7 +17,6 @@
 import org.eclipse.osbp.ecview.core.common.binding.IECViewBindingManager;
 import org.eclipse.osbp.ecview.core.common.editpart.binding.IBindableValueEndpointEditpart;
 import org.eclipse.osbp.ecview.core.common.editpart.emf.CommandEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YSetNewBeanInstanceCommand;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.commands.ISetNewInstanceCommandEditpart;
 import org.eclipse.osbp.runtime.common.state.ISharedStateContext;
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/BrowserDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/BrowserDatatypeEditpart.java
index 974380c..095c9a4 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/BrowserDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/BrowserDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YBrowserDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.IBrowserDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/CheckBoxDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/CheckBoxDatatypeEditpart.java
index 9268226..49ba5c9 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/CheckBoxDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/CheckBoxDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YCheckBoxDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.ICheckBoxDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ComboBoxDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ComboBoxDatatypeEditpart.java
index e4a9768..bf1d796 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ComboBoxDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ComboBoxDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YComboBoxDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.IComboBoxDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/DateTimeDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/DateTimeDatatypeEditpart.java
index 34e1cc2..84d5b67 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/DateTimeDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/DateTimeDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YDateTimeDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.IDateTimeDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/DecimalDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/DecimalDatatypeEditpart.java
index 57b2ec6..74bc0b7 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/DecimalDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/DecimalDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YDecimalDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.IDecimalDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ListDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ListDatatypeEditpart.java
index 28e2c23..a8d69ff 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ListDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ListDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YListDataType;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.IListDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/NumericDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/NumericDatatypeEditpart.java
index 8696650..dc608e0 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/NumericDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/NumericDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YNumericDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.INumericDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/OptionsGroupDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/OptionsGroupDatatypeEditpart.java
index 5e45059..71e63cf 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/OptionsGroupDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/OptionsGroupDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YOptionsGroupDataType;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.IOptionsGroupDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ProgressBarDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ProgressBarDatatypeEditpart.java
index 02c1ed7..281a47e 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ProgressBarDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/ProgressBarDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YProgressBarDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.IProgressBarDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TabSheetDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TabSheetDatatypeEditpart.java
index 65e5ded..0062f42 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TabSheetDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TabSheetDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YTabSheetDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.ITabSheetDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TableDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TableDatatypeEditpart.java
index 75514f1..74ec521 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TableDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TableDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YTableDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.ITableDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TextAreaDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TextAreaDatatypeEditpart.java
index 50631db..626ed44 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TextAreaDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TextAreaDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YTextAreaDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.ITextAreaDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TextDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TextDatatypeEditpart.java
index d247d3b..82d9104 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TextDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TextDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YTextDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.ITextDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TreeDatatypeEditpart.java b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TreeDatatypeEditpart.java
index cebd3c4..1c9cfe4 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TreeDatatypeEditpart.java
+++ b/org.eclipse.osbp.ecview.core.extension.editparts.emf/src/org/eclipse/osbp/ecview/core/extension/editpart/emf/datatypes/TreeDatatypeEditpart.java
@@ -11,7 +11,6 @@
 package org.eclipse.osbp.ecview.core.extension.editpart.emf.datatypes;
 
 import org.eclipse.osbp.ecview.core.common.editpart.emf.datatypes.DatatypeEditpart;
-import org.eclipse.osbp.ecview.core.extension.model.datatypes.ExtDatatypesFactory;
 import org.eclipse.osbp.ecview.core.extension.model.datatypes.YTreeDatatype;
 import org.eclipse.osbp.ecview.core.ui.core.editparts.extension.datatypes.ITreeDatatypeEditpart;
 
diff --git a/org.eclipse.osbp.ecview.core.extension.editparts/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.extension.editparts/META-INF/MANIFEST.MF
index 21a580c..9a35b4d 100644
--- a/org.eclipse.osbp.ecview.core.extension.editparts/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.extension.editparts/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.eclipse.osbp.ecview.core.extension.editparts
 Bundle-Vendor: Eclipse OSBP
 Bundle-Version: 0.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.service.component;version="1.2.0",
  org.slf4j
 Service-Component: OSGI-INF/editPartManager.xml,
@@ -21,5 +21,5 @@
   uses:="org.eclipse.osbp.ecview.core.common.presentation,
    org.eclipse.osbp.ecview.core.ui.core.editparts.extension";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.4.1,1.5.0)",
+ org.eclipse.core.databinding;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)"
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.extension.model.edit/META-INF/MANIFEST.MF
index 188d94d..765a8ba 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/META-INF/MANIFEST.MF
@@ -6,14 +6,13 @@
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.osbp.ecview.core.extension.model.datatypes.provider.ExtensionEditPlugin$Implementation
 Bundle-Vendor: Eclipse OSBP
- Germany)
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.osbp.ecview.core.extension.model.datatypes.provider,
  org.eclipse.osbp.ecview.core.extension.model.extension.provider
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.osbp.ecview.core.extension.model;visibility:=reexport,
+ org.eclipse.osbp.ecview.core.extension.model;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.osbp.ecview.core.common.model;visibility:=reexport,
- org.eclipse.osbp.ecview.core.common.model.edit;visibility:=reexport
+ org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
+ org.eclipse.osbp.ecview.core.common.model.edit;bundle-version="[0.9.0,0.10.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/plugin.properties b/org.eclipse.osbp.ecview.core.extension.model.edit/plugin.properties
index f29094a..085ccf3 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/plugin.properties
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/plugin.properties
@@ -380,3 +380,33 @@
 _UI_YSuggestTextFieldEvents_CLEAR_literal = CLEAR
 _UI_YButton_captionProperty_feature = Caption Property
 _UI_YButton_image_feature = Image
+_UI_YSortColumn_type = YSort Column
+_UI_YTable_sortOrder_feature = Sort Order
+_UI_YSortColumn_propertyPath_feature = Property Path
+_UI_YSortColumn_type_feature = Type
+_UI_YSortColumn_typeQualifiedName_feature = Type Qualified Name
+_UI_YSortColumn_asc_feature = Asc
+_UI_YSuggestTextFieldEvents_SELECTED_literal = SELECTED
+_UI_YSuggestTextField_keys_feature = Keys
+_UI_YFilteringComponent_type = YFiltering Component
+_UI_YFilterDescriptor_type = YFilter Descriptor
+_UI_YFilteringComponent_type_feature = Type
+_UI_YFilteringComponent_emfNsURI_feature = Emf Ns URI
+_UI_YFilteringComponent_typeQualifiedName_feature = Type Qualified Name
+_UI_YFilteringComponent_applyFilter_feature = Apply Filter
+_UI_YFilteringComponent_filter_feature = Filter
+_UI_YFilteringComponent_descriptors_feature = Descriptors
+_UI_YFilterDescriptor_propertyPath_feature = Property Path
+_UI_YFilterDescriptor_type_feature = Type
+_UI_YFilteringType_COMPARE_literal = COMPARE
+_UI_YFilteringType_RANGE_literal = RANGE
+_UI_YFilteringComponent_resetFilter_feature = Reset Filter
+_UI_YFilterTableDescriptor_type = YFilter Table Descriptor
+_UI_YFilteringComponent_filterDescriptors_feature = Filter Descriptors
+_UI_YFilteringComponent_tableDescriptors_feature = Table Descriptors
+_UI_YFilterTableDescriptor_propertyPath_feature = Property Path
+_UI_YBeanReferenceField_filteringComponent_feature = Filtering Component
+_UI_YFilteringComponent_selectionBeanSlotName_feature = Selection Bean Slot Name
+_UI_YFilteringComponent_filterCols_feature = Filter Cols
+_UI_YTable_doSort_feature = Do Sort
+_UI_YTable_scrollToBottom_feature = Scroll To Bottom
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/ExtensionModelItemProviderAdapterFactory.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/ExtensionModelItemProviderAdapterFactory.java
index 163a5a0..208ebce 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/ExtensionModelItemProviderAdapterFactory.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/ExtensionModelItemProviderAdapterFactory.java
@@ -314,6 +314,29 @@
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.core.extension.model.extension.YSortColumn} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YSortColumnItemProvider ySortColumnItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.core.extension.model.extension.YSortColumn}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createYSortColumnAdapter() {
+		if (ySortColumnItemProvider == null) {
+			ySortColumnItemProvider = new YSortColumnItemProvider(this);
+		}
+
+		return ySortColumnItemProvider;
+	}
+
+	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.core.extension.model.extension.YTree} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1326,6 +1349,75 @@
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.core.extension.model.extension.YFilteringComponent} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YFilteringComponentItemProvider yFilteringComponentItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.core.extension.model.extension.YFilteringComponent}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createYFilteringComponentAdapter() {
+		if (yFilteringComponentItemProvider == null) {
+			yFilteringComponentItemProvider = new YFilteringComponentItemProvider(this);
+		}
+
+		return yFilteringComponentItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.core.extension.model.extension.YFilterDescriptor} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YFilterDescriptorItemProvider yFilterDescriptorItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.core.extension.model.extension.YFilterDescriptor}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createYFilterDescriptorAdapter() {
+		if (yFilterDescriptorItemProvider == null) {
+			yFilterDescriptorItemProvider = new YFilterDescriptorItemProvider(this);
+		}
+
+		return yFilterDescriptorItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.osbp.ecview.core.extension.model.extension.YFilterTableDescriptor} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected YFilterTableDescriptorItemProvider yFilterTableDescriptorItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.osbp.ecview.core.extension.model.extension.YFilterTableDescriptor}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createYFilterTableDescriptorAdapter() {
+		if (yFilterTableDescriptorItemProvider == null) {
+			yFilterTableDescriptorItemProvider = new YFilterTableDescriptorItemProvider(this);
+		}
+
+		return yFilterTableDescriptorItemProvider;
+	}
+
+	/**
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1460,6 +1552,7 @@
 		if (ySpanInfoItemProvider != null) ySpanInfoItemProvider.dispose();
 		if (yTableItemProvider != null) yTableItemProvider.dispose();
 		if (yColumnItemProvider != null) yColumnItemProvider.dispose();
+		if (ySortColumnItemProvider != null) ySortColumnItemProvider.dispose();
 		if (yTreeItemProvider != null) yTreeItemProvider.dispose();
 		if (yOptionsGroupItemProvider != null) yOptionsGroupItemProvider.dispose();
 		if (yListItemProvider != null) yListItemProvider.dispose();
@@ -1504,6 +1597,9 @@
 		if (yAbsoluteLayoutCellStyleItemProvider != null) yAbsoluteLayoutCellStyleItemProvider.dispose();
 		if (ySuggestTextFieldItemProvider != null) ySuggestTextFieldItemProvider.dispose();
 		if (yPasswordFieldItemProvider != null) yPasswordFieldItemProvider.dispose();
+		if (yFilteringComponentItemProvider != null) yFilteringComponentItemProvider.dispose();
+		if (yFilterDescriptorItemProvider != null) yFilterDescriptorItemProvider.dispose();
+		if (yFilterTableDescriptorItemProvider != null) yFilterTableDescriptorItemProvider.dispose();
 	}
 
 	/**
@@ -1748,6 +1844,11 @@
 						(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
 						 ExtensionModelFactory.eINSTANCE.createYPasswordField()));
 
+				newChildDescriptors.add
+					(createChildParameter
+						(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+						 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
 				return null;
 			}
  
@@ -1953,6 +2054,11 @@
 						(CoreModelPackage.Literals.YVIEW__CONTENT,
 						 ExtensionModelFactory.eINSTANCE.createYPasswordField()));
 
+				newChildDescriptors.add
+					(createChildParameter
+						(CoreModelPackage.Literals.YVIEW__CONTENT,
+						 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
 				return null;
 			}
  
@@ -2158,6 +2264,11 @@
 						(CoreModelPackage.Literals.YDIALOG__CONTENT,
 						 ExtensionModelFactory.eINSTANCE.createYPasswordField()));
 
+				newChildDescriptors.add
+					(createChildParameter
+						(CoreModelPackage.Literals.YDIALOG__CONTENT,
+						 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
 				return null;
 			}
  
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YAbsoluteLayoutItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YAbsoluteLayoutItemProvider.java
index 3b7fe20..b5fdf3c 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YAbsoluteLayoutItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YAbsoluteLayoutItemProvider.java
@@ -470,6 +470,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(ExtensionModelPackage.Literals.YABSOLUTE_LAYOUT__CELL_STYLES,
 				 ExtensionModelFactory.eINSTANCE.createYAbsoluteLayoutCellStyle()));
 	}
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YBeanReferenceFieldItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YBeanReferenceFieldItemProvider.java
index 2be6b25..0182513 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YBeanReferenceFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YBeanReferenceFieldItemProvider.java
@@ -20,6 +20,7 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
@@ -27,6 +28,7 @@
 
 import org.eclipse.osbp.ecview.core.common.model.core.CoreModelPackage;
 
+import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelFactory;
 import org.eclipse.osbp.ecview.core.extension.model.extension.ExtensionModelPackage;
 import org.eclipse.osbp.ecview.core.extension.model.extension.YBeanReferenceField;
 
@@ -60,6 +62,8 @@
 
 			addValueBindingEndpointPropertyDescriptor(object);
 			addUseBeanServicePropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
 			addTypePropertyDescriptor(object);
@@ -124,6 +128,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datadescription feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -454,6 +502,36 @@
 	}
 
 	/**
+	 * 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(ExtensionModelPackage.Literals.YBEAN_REFERENCE_FIELD__FILTERING_COMPONENT);
+		}
+		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 YBeanReferenceField.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -508,6 +586,9 @@
 			case ExtensionModelPackage.YBEAN_REFERENCE_FIELD__REQUIRED:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
+			case ExtensionModelPackage.YBEAN_REFERENCE_FIELD__FILTERING_COMPONENT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -522,6 +603,11 @@
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(ExtensionModelPackage.Literals.YBEAN_REFERENCE_FIELD__FILTERING_COMPONENT,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YButtonItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YButtonItemProvider.java
index ac67881..18887f9 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YButtonItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YButtonItemProvider.java
@@ -58,7 +58,11 @@
 
 			addInitialEditablePropertyDescriptor(object);
 			addEditablePropertyDescriptor(object);
+			addLayoutIdxPropertyDescriptor(object);
+			addLayoutColumnsPropertyDescriptor(object);
 			addTabIndexPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addClickListenersPropertyDescriptor(object);
 			addLastClickTimePropertyDescriptor(object);
@@ -112,6 +116,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Layout Idx feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutIdxPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutIdx_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutIdx_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_IDX,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Layout Columns feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutColumnsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutColumns_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutColumns_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_COLUMNS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Tab Index feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -134,6 +182,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datadescription feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -261,6 +353,8 @@
 		switch (notification.getFeatureID(YButton.class)) {
 			case ExtensionModelPackage.YBUTTON__INITIAL_EDITABLE:
 			case ExtensionModelPackage.YBUTTON__EDITABLE:
+			case ExtensionModelPackage.YBUTTON__LAYOUT_IDX:
+			case ExtensionModelPackage.YBUTTON__LAYOUT_COLUMNS:
 			case ExtensionModelPackage.YBUTTON__TAB_INDEX:
 			case ExtensionModelPackage.YBUTTON__CLICK_LISTENERS:
 			case ExtensionModelPackage.YBUTTON__LAST_CLICK_TIME:
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YCheckBoxItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YCheckBoxItemProvider.java
index fbdf6f5..6d465e6 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YCheckBoxItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YCheckBoxItemProvider.java
@@ -59,6 +59,8 @@
 			super.getPropertyDescriptors(object);
 
 			addValueBindingEndpointPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addDatatypePropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
@@ -89,6 +91,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datadescription feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YCssLayoutItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YCssLayoutItemProvider.java
index cbe1770..3153b85 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YCssLayoutItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YCssLayoutItemProvider.java
@@ -470,6 +470,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(ExtensionModelPackage.Literals.YCSS_LAYOUT__CELL_STYLES,
 				 ExtensionModelFactory.eINSTANCE.createYCssLayoutCellStyle()));
 	}
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YDateTimeItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YDateTimeItemProvider.java
index 4cc5b69..8d48c88 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YDateTimeItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YDateTimeItemProvider.java
@@ -59,6 +59,8 @@
 			super.getPropertyDescriptors(object);
 
 			addValueBindingEndpointPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
 			addDatatypePropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
@@ -89,6 +91,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datatype feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YDecimalFieldItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YDecimalFieldItemProvider.java
index 23d2008..4ef9aa8 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YDecimalFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YDecimalFieldItemProvider.java
@@ -59,6 +59,8 @@
 			super.getPropertyDescriptors(object);
 
 			addValueBindingEndpointPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
 			addDatatypePropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
@@ -89,6 +91,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datatype feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YFormLayoutItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YFormLayoutItemProvider.java
index 6f59954..554c469 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YFormLayoutItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YFormLayoutItemProvider.java
@@ -470,6 +470,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(ExtensionModelPackage.Literals.YFORM_LAYOUT__CELL_STYLES,
 				 ExtensionModelFactory.eINSTANCE.createYFormLayoutCellStyle()));
 	}
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YGridLayoutItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YGridLayoutItemProvider.java
index be57bc1..88afa6a 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YGridLayoutItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YGridLayoutItemProvider.java
@@ -494,6 +494,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(ExtensionModelPackage.Literals.YGRID_LAYOUT__CELL_STYLES,
 				 ExtensionModelFactory.eINSTANCE.createYGridLayoutCellStyle()));
 	}
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YHorizontalLayoutItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YHorizontalLayoutItemProvider.java
index a3f2507..3ab3776 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YHorizontalLayoutItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YHorizontalLayoutItemProvider.java
@@ -470,6 +470,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(ExtensionModelPackage.Literals.YHORIZONTAL_LAYOUT__CELL_STYLES,
 				 ExtensionModelFactory.eINSTANCE.createYHorizontalLayoutCellStyle()));
 	}
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YMasterDetailItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YMasterDetailItemProvider.java
index db4041c..3316033 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YMasterDetailItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YMasterDetailItemProvider.java
@@ -566,6 +566,11 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(ExtensionModelPackage.Literals.YMASTER_DETAIL__MASTER_ELEMENT,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(ExtensionModelPackage.Literals.YMASTER_DETAIL__MASTER_ELEMENT,
 				 CoreModelFactory.eINSTANCE.createYLayout()));
 
 		newChildDescriptors.add
@@ -781,6 +786,11 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(ExtensionModelPackage.Literals.YMASTER_DETAIL__DETAIL_ELEMENT,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(ExtensionModelPackage.Literals.YMASTER_DETAIL__DETAIL_ELEMENT,
 				 CoreModelFactory.eINSTANCE.createYLayout()));
 
 		newChildDescriptors.add
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YNumericFieldItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YNumericFieldItemProvider.java
index eba5e02..ec5eb48 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YNumericFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YNumericFieldItemProvider.java
@@ -59,6 +59,8 @@
 			super.getPropertyDescriptors(object);
 
 			addValueBindingEndpointPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
 			addDatatypePropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
@@ -89,6 +91,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datatype feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YPanelItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YPanelItemProvider.java
index 886857f..23905c3 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YPanelItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YPanelItemProvider.java
@@ -57,6 +57,8 @@
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addLayoutIdxPropertyDescriptor(object);
+			addLayoutColumnsPropertyDescriptor(object);
 			addTabIndexPropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addFirstContentPropertyDescriptor(object);
@@ -66,6 +68,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Layout Idx feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutIdxPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutIdx_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutIdx_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_IDX,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Layout Columns feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutColumnsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutColumns_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutColumns_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_COLUMNS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Tab Index feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -191,6 +237,8 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(YPanel.class)) {
+			case ExtensionModelPackage.YPANEL__LAYOUT_IDX:
+			case ExtensionModelPackage.YPANEL__LAYOUT_COLUMNS:
 			case ExtensionModelPackage.YPANEL__TAB_INDEX:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
@@ -478,6 +526,11 @@
 			(createChildParameter
 				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
 				 ExtensionModelFactory.eINSTANCE.createYPasswordField()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
 	}
 
 }
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YPasswordFieldItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YPasswordFieldItemProvider.java
index dc13657..36e6728 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YPasswordFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YPasswordFieldItemProvider.java
@@ -48,6 +48,9 @@
 			super.getPropertyDescriptors(object);
 
 			addValueBindingEndpointPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
+			addLastTextChangePropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
 		}
@@ -77,6 +80,72 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Text Change feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastTextChangePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YTextChangeNotifier_lastTextChange_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YTextChangeNotifier_lastTextChange_feature", "_UI_YTextChangeNotifier_type"),
+				 CoreModelPackage.Literals.YTEXT_CHANGE_NOTIFIER__LAST_TEXT_CHANGE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datadescription feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -158,6 +227,7 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(YPasswordField.class)) {
+			case ExtensionModelPackage.YPASSWORD_FIELD__LAST_TEXT_CHANGE:
 			case ExtensionModelPackage.YPASSWORD_FIELD__VALUE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSearchPanelItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSearchPanelItemProvider.java
index 1e871ee..b45f85d 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSearchPanelItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSearchPanelItemProvider.java
@@ -553,6 +553,11 @@
 			(createChildParameter
 				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
 				 ExtensionModelFactory.eINSTANCE.createYPasswordField()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
 	}
 
 }
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSplitPanelItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSplitPanelItemProvider.java
index e4fea53..506f96d 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSplitPanelItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSplitPanelItemProvider.java
@@ -517,6 +517,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(ExtensionModelPackage.Literals.YSPLIT_PANEL__CELL_STYLES,
 				 ExtensionModelFactory.eINSTANCE.createYHorizontalLayoutCellStyle()));
 	}
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSuggestTextFieldItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSuggestTextFieldItemProvider.java
index a32679d..37c77e7 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSuggestTextFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YSuggestTextFieldItemProvider.java
@@ -59,9 +59,12 @@
 			super.getPropertyDescriptors(object);
 
 			addValueBindingEndpointPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
 			addDatatypePropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
+			addKeysPropertyDescriptor(object);
 			addUseSuggestionsPropertyDescriptor(object);
 			addAutoHidePopupPropertyDescriptor(object);
 			addLastSuggestionPropertyDescriptor(object);
@@ -99,6 +102,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datatype feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -165,6 +212,28 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Keys feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addKeysPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YSuggestTextField_keys_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YSuggestTextField_keys_feature", "_UI_YSuggestTextField_type"),
+				 ExtensionModelPackage.Literals.YSUGGEST_TEXT_FIELD__KEYS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Use Suggestions feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -423,6 +492,7 @@
 
 		switch (notification.getFeatureID(YSuggestTextField.class)) {
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__VALUE:
+			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__KEYS:
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__USE_SUGGESTIONS:
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__AUTO_HIDE_POPUP:
 			case ExtensionModelPackage.YSUGGEST_TEXT_FIELD__LAST_SUGGESTION:
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTabItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTabItemProvider.java
index 1763823..4be4aab 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTabItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTabItemProvider.java
@@ -515,6 +515,11 @@
 		newChildDescriptors.add
 			(createChildParameter
 				(ExtensionModelPackage.Literals.YTAB__EMBEDDABLE,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(ExtensionModelPackage.Literals.YTAB__EMBEDDABLE,
 				 CoreModelFactory.eINSTANCE.createYLayout()));
 
 		newChildDescriptors.add
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTabSheetItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTabSheetItemProvider.java
index c905cb2..03d1e83 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTabSheetItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTabSheetItemProvider.java
@@ -58,12 +58,58 @@
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addLayoutIdxPropertyDescriptor(object);
+			addLayoutColumnsPropertyDescriptor(object);
 			addTabIndexPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
+	 * This adds a property descriptor for the Layout Idx feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutIdxPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutIdx_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutIdx_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_IDX,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Layout Columns feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutColumnsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutColumns_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutColumns_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_COLUMNS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Tab Index feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -153,6 +199,8 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(YTabSheet.class)) {
+			case ExtensionModelPackage.YTAB_SHEET__LAYOUT_IDX:
+			case ExtensionModelPackage.YTAB_SHEET__LAYOUT_COLUMNS:
 			case ExtensionModelPackage.YTAB_SHEET__TAB_INDEX:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTableItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTableItemProvider.java
index cd22000..f8ae020 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTableItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTableItemProvider.java
@@ -77,6 +77,8 @@
 			addItemImagePropertyPropertyDescriptor(object);
 			addFilterPropertyDescriptor(object);
 			addRefreshPropertyDescriptor(object);
+			addDoSortPropertyDescriptor(object);
+			addScrollToBottomPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -434,6 +436,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Do Sort feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDoSortPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YTable_doSort_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YTable_doSort_feature", "_UI_YTable_type"),
+				 ExtensionModelPackage.Literals.YTABLE__DO_SORT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Scroll To Bottom feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addScrollToBottomPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YTable_scrollToBottom_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YTable_scrollToBottom_feature", "_UI_YTable_type"),
+				 ExtensionModelPackage.Literals.YTABLE__SCROLL_TO_BOTTOM,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_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}.
@@ -446,6 +492,7 @@
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(ExtensionModelPackage.Literals.YTABLE__COLUMNS);
+			childrenFeatures.add(ExtensionModelPackage.Literals.YTABLE__SORT_ORDER);
 		}
 		return childrenFeatures;
 	}
@@ -512,9 +559,12 @@
 			case ExtensionModelPackage.YTABLE__ITEM_IMAGE_PROPERTY:
 			case ExtensionModelPackage.YTABLE__FILTER:
 			case ExtensionModelPackage.YTABLE__REFRESH:
+			case ExtensionModelPackage.YTABLE__DO_SORT:
+			case ExtensionModelPackage.YTABLE__SCROLL_TO_BOTTOM:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case ExtensionModelPackage.YTABLE__COLUMNS:
+			case ExtensionModelPackage.YTABLE__SORT_ORDER:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -536,6 +586,11 @@
 			(createChildParameter
 				(ExtensionModelPackage.Literals.YTABLE__COLUMNS,
 				 ExtensionModelFactory.eINSTANCE.createYColumn()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(ExtensionModelPackage.Literals.YTABLE__SORT_ORDER,
+				 ExtensionModelFactory.eINSTANCE.createYSortColumn()));
 	}
 
 	/**
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTextAreaItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTextAreaItemProvider.java
index 68c69e0..e5d28ab 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTextAreaItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTextAreaItemProvider.java
@@ -59,6 +59,9 @@
 			super.getPropertyDescriptors(object);
 
 			addValueBindingEndpointPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
+			addLastTextChangePropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addDatatypePropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
@@ -91,6 +94,72 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Text Change feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastTextChangePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YTextChangeNotifier_lastTextChange_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YTextChangeNotifier_lastTextChange_feature", "_UI_YTextChangeNotifier_type"),
+				 CoreModelPackage.Literals.YTEXT_CHANGE_NOTIFIER__LAST_TEXT_CHANGE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datadescription feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -238,6 +307,7 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(YTextArea.class)) {
+			case ExtensionModelPackage.YTEXT_AREA__LAST_TEXT_CHANGE:
 			case ExtensionModelPackage.YTEXT_AREA__VALUE:
 			case ExtensionModelPackage.YTEXT_AREA__WORD_WRAP:
 			case ExtensionModelPackage.YTEXT_AREA__ROWS:
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTextFieldItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTextFieldItemProvider.java
index c88e933..9b8f506 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTextFieldItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YTextFieldItemProvider.java
@@ -59,6 +59,9 @@
 			super.getPropertyDescriptors(object);
 
 			addValueBindingEndpointPropertyDescriptor(object);
+			addLastFocusEventPropertyDescriptor(object);
+			addLastBlurEventPropertyDescriptor(object);
+			addLastTextChangePropertyDescriptor(object);
 			addDatatypePropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 			addValuePropertyDescriptor(object);
@@ -89,6 +92,72 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Last Focus Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastFocusEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusNotifier_lastFocusEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusNotifier_lastFocusEvent_feature", "_UI_YFocusNotifier_type"),
+				 CoreModelPackage.Literals.YFOCUS_NOTIFIER__LAST_FOCUS_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Blur Event feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastBlurEventPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YBlurNotifier_lastBlurEvent_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YBlurNotifier_lastBlurEvent_feature", "_UI_YBlurNotifier_type"),
+				 CoreModelPackage.Literals.YBLUR_NOTIFIER__LAST_BLUR_EVENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Last Text Change feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLastTextChangePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YTextChangeNotifier_lastTextChange_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YTextChangeNotifier_lastTextChange_feature", "_UI_YTextChangeNotifier_type"),
+				 CoreModelPackage.Literals.YTEXT_CHANGE_NOTIFIER__LAST_TEXT_CHANGE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Datatype feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -192,6 +261,7 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(YTextField.class)) {
+			case ExtensionModelPackage.YTEXT_FIELD__LAST_TEXT_CHANGE:
 			case ExtensionModelPackage.YTEXT_FIELD__VALUE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YToggleButtonItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YToggleButtonItemProvider.java
index db26f5d..436f1c1 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YToggleButtonItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YToggleButtonItemProvider.java
@@ -58,6 +58,8 @@
 
 			addInitialActivatedPropertyDescriptor(object);
 			addActivatedPropertyDescriptor(object);
+			addLayoutIdxPropertyDescriptor(object);
+			addLayoutColumnsPropertyDescriptor(object);
 			addTabIndexPropertyDescriptor(object);
 			addDatadescriptionPropertyDescriptor(object);
 		}
@@ -109,6 +111,50 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Layout Idx feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutIdxPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutIdx_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutIdx_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_IDX,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Layout Columns feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutColumnsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_YFocusable_layoutColumns_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_YFocusable_layoutColumns_feature", "_UI_YFocusable_type"),
+				 CoreModelPackage.Literals.YFOCUSABLE__LAYOUT_COLUMNS,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Tab Index feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -192,6 +238,8 @@
 		switch (notification.getFeatureID(YToggleButton.class)) {
 			case ExtensionModelPackage.YTOGGLE_BUTTON__INITIAL_ACTIVATED:
 			case ExtensionModelPackage.YTOGGLE_BUTTON__ACTIVATED:
+			case ExtensionModelPackage.YTOGGLE_BUTTON__LAYOUT_IDX:
+			case ExtensionModelPackage.YTOGGLE_BUTTON__LAYOUT_COLUMNS:
 			case ExtensionModelPackage.YTOGGLE_BUTTON__TAB_INDEX:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
diff --git a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YVerticalLayoutItemProvider.java b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YVerticalLayoutItemProvider.java
index 7a459e9..ed5f525 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YVerticalLayoutItemProvider.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.edit/src/org/eclipse/osbp/ecview/core/extension/model/extension/provider/YVerticalLayoutItemProvider.java
@@ -470,6 +470,11 @@
 
 		newChildDescriptors.add
 			(createChildParameter
+				(CoreModelPackage.Literals.YLAYOUT__ELEMENTS,
+				 ExtensionModelFactory.eINSTANCE.createYFilteringComponent()));
+
+		newChildDescriptors.add
+			(createChildParameter
 				(ExtensionModelPackage.Literals.YVERTICAL_LAYOUT__CELL_STYLES,
 				 ExtensionModelFactory.eINSTANCE.createYVerticalLayoutCellStyle()));
 	}
diff --git a/org.eclipse.osbp.ecview.core.extension.model.editor/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.extension.model.editor/META-INF/MANIFEST.MF
index 4a9e5fd..7ca849b 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.extension.model.editor/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@
 Bundle-Activator: org.eclipse.osbp.ecview.core.extension.model.datatypes.presentation.ExtensionEditorPlugin$Implementation
 Bundle-Vendor: Eclipse OSBP
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.osbp.ecview.core.extension.model.datatypes.presentation,
  org.eclipse.osbp.ecview.core.extension.model.extension.presentation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.osbp.ecview.core.extension.model.edit;visibility:=reexport,
+ org.eclipse.osbp.ecview.core.extension.model.edit;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.emf.edit.ui;visibility:=reexport,
  org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.osbp.ecview.core.common.model.edit;visibility:=reexport
+ org.eclipse.osbp.ecview.core.common.model.edit;bundle-version="[0.9.0,0.10.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/datatypes/presentation/ExtDatatypesEditor.java b/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/datatypes/presentation/ExtDatatypesEditor.java
index 16e4260..24e8fac 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/datatypes/presentation/ExtDatatypesEditor.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/datatypes/presentation/ExtDatatypesEditor.java
@@ -981,7 +981,7 @@
 	 * @generated
 	 */
 	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
 		Exception exception = null;
 		Resource resource = null;
 		try {
@@ -1009,10 +1009,11 @@
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
-					(Diagnostic.ERROR,
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
 					 "org.eclipse.osbp.ecview.core.extension.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
diff --git a/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/datatypes/presentation/ExtDatatypesModelWizard.java b/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/datatypes/presentation/ExtDatatypesModelWizard.java
index 806f1dd..e82dc74 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/datatypes/presentation/ExtDatatypesModelWizard.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/datatypes/presentation/ExtDatatypesModelWizard.java
@@ -406,8 +406,7 @@
 		 * @generated
 		 */
 		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			{
+			Composite composite = new Composite(parent, SWT.NONE); {
 				GridLayout layout = new GridLayout();
 				layout.numColumns = 1;
 				layout.verticalSpacing = 12;
diff --git a/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/extension/presentation/ExtensionModelEditor.java b/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/extension/presentation/ExtensionModelEditor.java
index a7a5734..396c85a 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/extension/presentation/ExtensionModelEditor.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/extension/presentation/ExtensionModelEditor.java
@@ -983,7 +983,7 @@
 	 * @generated
 	 */
 	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
 		Exception exception = null;
 		Resource resource = null;
 		try {
@@ -1011,10 +1011,11 @@
 	 * @generated
 	 */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
-					(Diagnostic.ERROR,
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
 					 "org.eclipse.osbp.ecview.core.extension.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
diff --git a/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/extension/presentation/ExtensionModelModelWizard.java b/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/extension/presentation/ExtensionModelModelWizard.java
index 8e4c156..6844428 100644
--- a/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/extension/presentation/ExtensionModelModelWizard.java
+++ b/org.eclipse.osbp.ecview.core.extension.model.editor/src/org/eclipse/osbp/ecview/core/extension/model/extension/presentation/ExtensionModelModelWizard.java
@@ -408,8 +408,7 @@
 		 * @generated
 		 */
 		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			{
+			Composite composite = new Composite(parent, SWT.NONE); {
 				GridLayout layout = new GridLayout();
 				layout.numColumns = 1;
 				layout.verticalSpacing = 12;
diff --git a/org.eclipse.osbp.ecview.core.extension.model/META-INF/MANIFEST.MF b/org.eclipse.osbp.ecview.core.extension.model/META-INF/MANIFEST.MF
index 5c23237..386fd9d 100644
--- a/org.eclipse.osbp.ecview.core.extension.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.ecview.core.extension.model/META-INF/MANIFEST.MF
@@ -5,9 +5,8 @@
 Bundle-Version: 0.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse OSBP
- Germany)
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.osbp.ecview.core.extension.model.datatypes;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.common.util,
@@ -25,7 +24,8 @@
    org.eclipse.emf.common.notify",
  org.eclipse.osbp.ecview.core.extension.model.extension;version="0.9.0",
  org.eclipse.osbp.ecview.core.extension.model.extension.impl;version="0.9.0",
- org.eclipse.osbp.ecview.core.extension.model.extension.listener;version="0.9.0";uses:="org.eclipse.osbp.ecview.core.extension.model.extension",
+ org.eclipse.osbp.ecview.core.extension.model.extension.listener;version="0.9.0";
+  uses:="org.eclipse.osbp.ecview.core.extension.model.extension",
  org.eclipse.osbp.ecview.core.extension.model.extension.util;version="0.9.0";
   uses:="org.eclipse.emf.ecore.util,
    org.eclipse.osbp.ecview.core.extension.model.extension,
@@ -39,6 +39,5 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.osbp.ecview.core.common.model;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
- org.eclipse.osbp.ecview.core.extension.model;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.osbp.vaadin.addons.designer.overlay;bundle-version="0.9.0"
+ org.eclipse.osbp.ecview.core.extension.model;bundle-version="[0.9.0,0.10.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore b/org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore
index 8bc0886..3ad2e2d 100644
--- a/org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore
+++ b/org.eclipse.osbp.ecview.core.extension.model/model/extension.ecore
@@ -97,7 +97,7 @@
         transient="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="collection" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
-        transient="true"/>
+        transient="true" unsettable="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="type">
       <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass">
         <eTypeArguments/>
@@ -114,6 +114,9 @@
         transient="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="sortOrder" upperBound="-1"
         eType="#//YSortColumn" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="doSort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scrollToBottom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="YColumn" eSuperTypes="../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -231,14 +234,16 @@
     <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:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YTextField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
+  <eClassifiers xsi:type="ecore:EClass" name="YTextField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YTextChangeNotifier">
     <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="ecore:EClass extdatatypes.ecore#//YTextDatatype"/>
     <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:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YBeanReferenceField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable #//YBeanServiceConsumer">
+  <eClassifiers xsi:type="ecore:EClass" name="YBeanReferenceField" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable #//YBeanServiceConsumer ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier">
     <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:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
@@ -270,8 +275,10 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceSourceTypeProperty"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="filteringComponent" eType="#//YFilteringComponent"
+        containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YTextArea" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
+  <eClassifiers xsi:type="ecore:EClass" name="YTextArea" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YTextChangeNotifier">
     <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 extdatatypes.ecore#//YTextAreaDatatype"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
@@ -281,7 +288,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="rows" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="3"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YCheckBox" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
+  <eClassifiers xsi:type="ecore:EClass" name="YCheckBox" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YBlurNotifier">
     <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 extdatatypes.ecore#//YCheckBoxDatatype"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
@@ -293,19 +300,19 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
         transient="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="YDateTime" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable">
+  <eClassifiers xsi:type="ecore:EClass" name="YDateTime" eSuperTypes="#//YInput ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YValueBindable ../../org.eclipse.osbp.ecview.core.common.model/model/core.ecore#//YFocusNotifier ../../org.eclips