diff --git a/features/org.jboss.tools.arquillian.feature/feature.xml b/features/org.jboss.tools.arquillian.feature/feature.xml
index 77c561c..14816a4 100644
--- a/features/org.jboss.tools.arquillian.feature/feature.xml
+++ b/features/org.jboss.tools.arquillian.feature/feature.xml
@@ -19,15 +19,15 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.sapphire" version="8.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sapphire.java" version="8.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sapphire.java.jdt" version="8.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sapphire.modeling.xml" version="8.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sapphire.osgi" version="8.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sapphire.platform" version="8.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sapphire.ui.swt.xml.editor" version="8.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sapphire.ui" version="8.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sapphire.ui.swt.gef" version="8.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sapphire" version="9.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sapphire.java" version="9.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sapphire.java.jdt" version="9.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sapphire.modeling.xml" version="9.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sapphire.osgi" version="9.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sapphire.platform" version="9.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sapphire.ui.swt.xml.editor" version="9.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sapphire.ui" version="9.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sapphire.ui.swt.gef" version="9.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/plugins/org.jboss.tools.arquillian.core/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.arquillian.core/META-INF/MANIFEST.MF
index 95899a8..37b37af 100644
--- a/plugins/org.jboss.tools.arquillian.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.arquillian.core/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.jboss.tools.foundation.core;bundle-version="1.0.0",
  org.eclipse.core.filesystem
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Export-Package: org.jboss.forge.arquillian.container,
diff --git a/plugins/org.jboss.tools.arquillian.maven.configurator/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.arquillian.maven.configurator/META-INF/MANIFEST.MF
index 89a7a90..fd48ae1 100644
--- a/plugins/org.jboss.tools.arquillian.maven.configurator/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.arquillian.maven.configurator/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jboss.tools.maven.ui,
  org.jboss.tools.arquillian.core,
  org.eclipse.jface
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/plugins/org.jboss.tools.arquillian.ui/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.arquillian.ui/META-INF/MANIFEST.MF
index ddec5fc..9aa852b 100644
--- a/plugins/org.jboss.tools.arquillian.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jboss.tools.arquillian.ui/META-INF/MANIFEST.MF
@@ -30,19 +30,19 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.103.0",
  org.eclipse.jdt.core.manipulation;bundle-version="1.5.0",
  org.eclipse.m2e.core.ui,
  org.eclipse.compare.core,
- org.eclipse.sapphire.platform;bundle-version="0.7.1",
- org.eclipse.sapphire.modeling;bundle-version="0.7.1",
- org.eclipse.sapphire.modeling.xml;bundle-version="0.7.1",
- org.eclipse.sapphire.java;bundle-version="0.7.1",
- org.eclipse.sapphire.ui;bundle-version="0.7.1",
- org.eclipse.sapphire.ui.swt.xml.editor;bundle-version="0.7.1",
+ org.eclipse.sapphire.platform;bundle-version="9.0.0",
+ org.eclipse.sapphire.modeling;bundle-version="9.0.0",
+ org.eclipse.sapphire.modeling.xml;bundle-version="9.0.0",
+ org.eclipse.sapphire.java;bundle-version="9.0.0",
+ org.eclipse.sapphire.ui;bundle-version="9.0.0",
+ org.eclipse.sapphire.ui.swt.xml.editor;bundle-version="9.0.0",
  org.eclipse.wst.sse.ui;bundle-version="1.3.200",
  org.eclipse.wst.xml.ui;bundle-version="1.1.401",
  org.eclipse.m2e.profiles.ui;bundle-version="1.5.0",
  org.eclipse.ui.workbench,
  org.eclipse.ui.browser;bundle-version="3.4.200"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Export-Package: org.jboss.tools.arquillian.editor.internal.actions,
diff --git a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Arquillian.java b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Arquillian.java
index 9b0e9b1..0b81105 100644
--- a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Arquillian.java
+++ b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Arquillian.java
@@ -14,11 +14,11 @@
 import org.eclipse.sapphire.ElementList;
 import org.eclipse.sapphire.ElementType;
 import org.eclipse.sapphire.ImpliedElementProperty;
+import org.eclipse.sapphire.Length;
 import org.eclipse.sapphire.ListProperty;
-import org.eclipse.sapphire.modeling.annotations.CountConstraint;
+import org.eclipse.sapphire.Type;
 import org.eclipse.sapphire.modeling.annotations.Label;
 import org.eclipse.sapphire.modeling.annotations.Service;
-import org.eclipse.sapphire.modeling.annotations.Type;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlNamespace;
@@ -44,7 +44,7 @@ public interface Arquillian extends Element {
 	@Type( base = Protocol.class )
     @Label( standard = "Default Protocol" )
     @XmlBinding( path = "defaultProtocol" )
-	@CountConstraint (max=1)
+	@Length (max=1)
     ImpliedElementProperty PROP_DEFAULT_PROTOCOL = 
     	new ImpliedElementProperty( TYPE, "DefaultProtocol" ); //$NON-NLS-1$ 
 
@@ -53,7 +53,7 @@ public interface Arquillian extends Element {
 	@Type( base = Engine.class )
     @Label( standard = "Engine" )
     @XmlBinding( path = "engine" )
-	@CountConstraint (max=1)
+	@Length (max=1)
     ImpliedElementProperty PROP_ENGINE = 
     	new ImpliedElementProperty( TYPE, "Engine" ); //$NON-NLS-1$ 
 
diff --git a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Configuration.java b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Configuration.java
index 75e1593..864dc13 100644
--- a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Configuration.java
+++ b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Configuration.java
@@ -14,8 +14,8 @@
 import org.eclipse.sapphire.ElementList;
 import org.eclipse.sapphire.ElementType;
 import org.eclipse.sapphire.ListProperty;
+import org.eclipse.sapphire.Type;
 import org.eclipse.sapphire.modeling.annotations.Label;
-import org.eclipse.sapphire.modeling.annotations.Type;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
diff --git a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Container.java b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Container.java
index 9b9e678..0ed1da7 100644
--- a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Container.java
+++ b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Container.java
@@ -14,11 +14,12 @@
 import org.eclipse.sapphire.ElementList;
 import org.eclipse.sapphire.ElementType;
 import org.eclipse.sapphire.ImpliedElementProperty;
+import org.eclipse.sapphire.Length;
 import org.eclipse.sapphire.ListProperty;
+import org.eclipse.sapphire.Type;
 import org.eclipse.sapphire.Unique;
 import org.eclipse.sapphire.Value;
 import org.eclipse.sapphire.ValueProperty;
-import org.eclipse.sapphire.modeling.annotations.CountConstraint;
 import org.eclipse.sapphire.modeling.annotations.DefaultValue;
 import org.eclipse.sapphire.modeling.annotations.Fact;
 import org.eclipse.sapphire.modeling.annotations.Facts;
@@ -26,7 +27,6 @@
 import org.eclipse.sapphire.modeling.annotations.Required;
 import org.eclipse.sapphire.modeling.annotations.Service;
 import org.eclipse.sapphire.modeling.annotations.Services;
-import org.eclipse.sapphire.modeling.annotations.Type;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 import org.jboss.tools.arquillian.editor.internal.services.ContainerProfilesService;
@@ -79,7 +79,7 @@ public interface Container extends Element {
 
 	@Type(base = Configuration.class)
 	@Label(standard = "Configuration")
-	@CountConstraint (max=1)
+	@Length (max=1)
 	@XmlBinding( path = "configuration" )
 	ImpliedElementProperty PROP_CONFIGURATION = 
 		new ImpliedElementProperty( TYPE, "Configuration" ); //$NON-NLS-1$ 
diff --git a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Engine.java b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Engine.java
index 32f1061..ad9a8c2 100644
--- a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Engine.java
+++ b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Engine.java
@@ -14,8 +14,8 @@
 import org.eclipse.sapphire.ElementList;
 import org.eclipse.sapphire.ElementType;
 import org.eclipse.sapphire.ListProperty;
+import org.eclipse.sapphire.Type;
 import org.eclipse.sapphire.modeling.annotations.Label;
-import org.eclipse.sapphire.modeling.annotations.Type;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
 /**
diff --git a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Extension.java b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Extension.java
index d8fa0ad..c5e959e 100644
--- a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Extension.java
+++ b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Extension.java
@@ -14,13 +14,13 @@
 import org.eclipse.sapphire.ElementList;
 import org.eclipse.sapphire.ElementType;
 import org.eclipse.sapphire.ListProperty;
+import org.eclipse.sapphire.Type;
 import org.eclipse.sapphire.Unique;
 import org.eclipse.sapphire.Value;
 import org.eclipse.sapphire.ValueProperty;
 import org.eclipse.sapphire.modeling.annotations.Enablement;
 import org.eclipse.sapphire.modeling.annotations.Label;
 import org.eclipse.sapphire.modeling.annotations.Required;
-import org.eclipse.sapphire.modeling.annotations.Type;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
diff --git a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Group.java b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Group.java
index 94a2fa2..4ca4cf2 100644
--- a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Group.java
+++ b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Group.java
@@ -13,17 +13,17 @@
 import org.eclipse.sapphire.Element;
 import org.eclipse.sapphire.ElementList;
 import org.eclipse.sapphire.ElementType;
+import org.eclipse.sapphire.Length;
 import org.eclipse.sapphire.ListProperty;
+import org.eclipse.sapphire.Type;
 import org.eclipse.sapphire.Unique;
 import org.eclipse.sapphire.Value;
 import org.eclipse.sapphire.ValueProperty;
-import org.eclipse.sapphire.modeling.annotations.CountConstraint;
 import org.eclipse.sapphire.modeling.annotations.DefaultValue;
 import org.eclipse.sapphire.modeling.annotations.Fact;
 import org.eclipse.sapphire.modeling.annotations.Facts;
 import org.eclipse.sapphire.modeling.annotations.Label;
 import org.eclipse.sapphire.modeling.annotations.Required;
-import org.eclipse.sapphire.modeling.annotations.Type;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 
@@ -61,7 +61,7 @@ public interface Group extends Element {
     
 	@Type( base = Container.class )
     @Label( standard = "Container" )
-	@CountConstraint(min=1)
+	@Length(min=1)
     @XmlListBinding( mappings = @XmlListBinding.Mapping( element = "container", type = Container.class ))
     ListProperty PROP_CONTAINER = new ListProperty( TYPE, "Container" ); //$NON-NLS-1$ 
 
diff --git a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Protocol.java b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Protocol.java
index 05a20d4..ad374b8 100644
--- a/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Protocol.java
+++ b/plugins/org.jboss.tools.arquillian.ui/src/org/jboss/tools/arquillian/editor/internal/model/Protocol.java
@@ -14,6 +14,7 @@
 import org.eclipse.sapphire.ElementList;
 import org.eclipse.sapphire.ElementType;
 import org.eclipse.sapphire.ListProperty;
+import org.eclipse.sapphire.Type;
 import org.eclipse.sapphire.Unique;
 import org.eclipse.sapphire.Value;
 import org.eclipse.sapphire.ValueProperty;
@@ -21,7 +22,6 @@
 import org.eclipse.sapphire.modeling.annotations.Enablement;
 import org.eclipse.sapphire.modeling.annotations.Label;
 import org.eclipse.sapphire.modeling.annotations.Service;
-import org.eclipse.sapphire.modeling.annotations.Type;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
 import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
 import org.jboss.tools.arquillian.editor.internal.services.ProtocolDependenciesService;