diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.071/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.071/META-INF/MANIFEST.MF
index 920234b..e111105 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.071/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.071/META-INF/MANIFEST.MF
@@ -14,9 +14,9 @@
  org.slf4j;version="1.7.2"
 Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.071
 Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.SwConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters071.utils.SectionRunnableLabelCacheBuilder.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.ConstraintsConverter.xml,
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.ConstraintsConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.SwConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.RootElementConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.HwConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters071.utils.SectionRunnableLabelCacheBuilder.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters071.impl.PropertyConstraintsConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.072/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.072/META-INF/MANIFEST.MF
index 9bcaf7d..6433e0c 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.072/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.072/META-INF/MANIFEST.MF
@@ -13,13 +13,13 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters072.utils.HwElementsCacheBuilder.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.CommonElementsConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.ConfigConverter.xml,
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.ConfigConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.SwConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.PropertyConstraintsConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters072.utils.HwElementsCacheBuilder.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.OSConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.RootElementConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.CommonElementsConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.StimuliConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters072.impl.ConstraintsConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.080/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.080/META-INF/MANIFEST.MF
index c1252a7..c8a2291 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.080/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.080/META-INF/MANIFEST.MF
@@ -14,10 +14,10 @@
  org.jdom2.output;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.MappingConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.PropertyConstraintsConverter.xml,
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.PropertyConstraintsConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.MappingConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.StimuliConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.SwConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.OSConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters080.impl.RootElementConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.081/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.081/META-INF/MANIFEST.MF
index 4d1b56a..a330683 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.081/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.081/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
+Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.RootElementConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.ConstraintsConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters081.utils.ConstraintElementsCacheBuilder.xml,
@@ -21,4 +22,3 @@
  OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.MappingConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.OSConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters081.impl.SwConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.082/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.082/META-INF/MANIFEST.MF
index f3dec74..18a4d55 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.082/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.082/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters082.impl.RootElementConverter.xml
 Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters082.impl.RootElementConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.083/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.083/META-INF/MANIFEST.MF
index 15f1611..155c99d 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.083/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.083/META-INF/MANIFEST.MF
@@ -13,9 +13,9 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
+Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.ComponentModelConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.SwConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.RootElementConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.StimuliConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters083.utils.PeriodicStimulusCacheBuilder.xml
-Bundle-ActivationPolicy: lazy
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters083.utils.PeriodicStimulusCacheBuilder.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters083.impl.StimuliConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.090/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.090/META-INF/MANIFEST.MF
index 97dabf6..aa6fd70 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.090/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.090/META-INF/MANIFEST.MF
@@ -13,9 +13,9 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters090.utils.UpdateCustomPropsPostProcessor.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters090.impl.HwReferencesConverter.xml,
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters090.impl.HwReferencesConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters090.impl.RootElementConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters090.impl.HwConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters090.utils.HWCacheBuilder.xml
-Bundle-ActivationPolicy: lazy
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters090.utils.HWCacheBuilder.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters090.utils.UpdateCustomPropsPostProcessor.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.091/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.091/META-INF/MANIFEST.MF
index 7d48aec..c659c09 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.091/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.091/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
+Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters091.impl.RootElementConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters091.impl.CustomPropertiesConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.092/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.092/META-INF/MANIFEST.MF
index 7ae27c4..84b2d32 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.092/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.092/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters092.impl.RootElementConverter.xml
 Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters092.impl.RootElementConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.093/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.093/META-INF/MANIFEST.MF
index a6c46d0..a37ca48 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.093/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.093/META-INF/MANIFEST.MF
@@ -13,11 +13,11 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters093.utils.HWCacheBuilder.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.HwConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.RootElementConverter.xml,
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.RootElementConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.SwConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.HwConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.OsConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters093.utils.HWCacheBuilder.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.StimulusConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters093.impl.MeasurementConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.094/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.094/META-INF/MANIFEST.MF
index ead31d1..4e4b6c1 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.094/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.094/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
+Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters094.impl.HwConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters094.impl.SwConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.095/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.095/META-INF/MANIFEST.MF
index 70357f4..bad00b5 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.095/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.095/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
+Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters095.impl.SwConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters095.impl.StimuliConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.096/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.096/META-INF/MANIFEST.MF
index 9b4f1af..22647d6 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.096/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.096/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@
  org.jdom2;version="2.0.6",
  org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j
+Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters096.impl.SwConverter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters096.impl.ConstraintsConverter.xml
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.097/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.097/META-INF/MANIFEST.MF
index ed22f85..7f3c677 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.097/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.097/META-INF/MANIFEST.MF
@@ -15,5 +15,5 @@
  org.slf4j
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters097.utils.ComponentPortInterfaceCacheBuilder.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters097.impl.ComponentsModelConverter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters097.utils.AmltModelReferencePostProcessor.xml
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters097.utils.AmltModelReferencePostProcessor.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters097.impl.ComponentsModelConverter.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.common/META-INF/MANIFEST.MF
index ca3641b..8fd1fcc 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@
  org.osgi.service.component;version="1.3.0",
  org.osgi.service.component.annotations;version="1.3.0";resolution:=optional,
  org.slf4j;version="1.7.2"
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.ModelMigration.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.MigrationProcessor.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter.xml
 Require-Bundle: org.eclipse.equinox.common;bundle-version="3.10.0"
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.ModelMigration.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter.xml,
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters.common.MigrationProcessor.xml
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationProcessor.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationProcessor.java
index af9d4c3..3d4761b 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationProcessor.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/MigrationProcessor.java
@@ -42,7 +42,7 @@
 	private static final String NEWLINE = System.getProperty("line.separator");
 
 	@Reference(target = "(component.factory=" + ServiceConstants.MODEL_MIGRATION_FACTORY + ")")
-	ComponentFactory factory;
+	ComponentFactory<ModelMigration> factory;
 
 	/**
 	 * Execute the migration for the provided {@link MigrationSettings}.
@@ -115,8 +115,8 @@
 				properties.put("caches.target", inputFilterExp);
 				properties.put("converter.target", inputOuputFilterExpression);
 				properties.put("postProcessor.target", inputOuputFilterExpression);
-				ComponentInstance newInstance = factory.newInstance(properties);
-				ModelMigration modelMigration = (ModelMigration) newInstance.getInstance();
+				ComponentInstance<ModelMigration> newInstance = factory.newInstance(properties);
+				ModelMigration modelMigration = newInstance.getInstance();
 
 				String outputModelVersion = modelMigration.getOutputModelVersion();
 
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/ModelMigration.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/ModelMigration.java
index 68cc881..bd18d5d 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/ModelMigration.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/ModelMigration.java
@@ -41,7 +41,7 @@
 	List<ICache> caches;
 
 	@Reference(target = "(component.factory=" + ServiceConstants.NAMESPACE_CONVERTER_FACTORY + ")")
-	ComponentFactory factory;
+	ComponentFactory<IConverter> factory;
 
 	@Reference
 	List<IConverter> converter;
@@ -69,8 +69,8 @@
 		Dictionary<String, Object> properties = new Hashtable<>();
 		properties.put(ServiceConstants.INPUT_MODEL_VERSION_PROPERTY, getInputModelVersion());
 		properties.put(ServiceConstants.OUTPUT_MODEL_VERSION_PROPERTY, getOutputModelVersion());
-		ComponentInstance newInstance = factory.newInstance(properties);
-		IConverter namespaceConverter = (IConverter) newInstance.getInstance();
+		ComponentInstance<IConverter> newInstance = factory.newInstance(properties);
+		IConverter namespaceConverter = newInstance.getInstance();
 
 		result.add(namespaceConverter);
 
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/AmaltheaNamespaceRegistry.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/AmaltheaNamespaceRegistry.java
index 4b495f9..51bfa13 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/AmaltheaNamespaceRegistry.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/AmaltheaNamespaceRegistry.java
@@ -141,6 +141,10 @@
 		AmaltheaNamespace ns097 = new AmaltheaNamespace();
 		ns097.registerMapping("am", "http://app4mc.eclipse.org/amalthea/0.9.7");
 		REGISTRY.put(ModelVersion._097.getVersion(), ns097);
+		
+		AmaltheaNamespace ns098 = new AmaltheaNamespace();
+		ns098.registerMapping("am", "http://app4mc.eclipse.org/amalthea/0.9.8-rev-0");
+		REGISTRY.put(ModelVersion._098.getVersion(), ns098);
 	}
 
 	/**
@@ -205,6 +209,9 @@
 		else if (isNamespaceAvailable(ModelVersion._097, namespace)) {
 			result = ModelVersion._097;
 		}
+		else if (isNamespaceAvailable(ModelVersion._098, namespace)) {
+			result = ModelVersion._098;
+		}
 		return result;
 	}
 
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/ModelVersion.java b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/ModelVersion.java
index 29e7ba8..144baf1 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/ModelVersion.java
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.common/src/org/eclipse/app4mc/amalthea/converters/common/utils/ModelVersion.java
@@ -1,6 +1,6 @@
 /**
  ********************************************************************************
- * Copyright (c) 2015-2019 Robert Bosch GmbH and others.
+ * Copyright (c) 2015-2020 Robert Bosch GmbH and others.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -45,7 +45,8 @@
 	_094("0.9.4"),
 	_095("0.9.5"),
 	_096("0.9.6"),
-	_097("0.9.7");
+	_097("0.9.7"),
+	_098("0.9.8");
 
 	private final String value;
 
diff --git a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/META-INF/MANIFEST.MF b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/META-INF/MANIFEST.MF
index 4edbe6a..a4643b7 100644
--- a/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.app4mc.amalthea.converters.headless.app/META-INF/MANIFEST.MF
@@ -15,6 +15,6 @@
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.equinox.common;bundle-version="3.10.0",
  org.apache.felix.gogo.runtime;bundle-version="1.0.6"
-Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.ModelMigrationCommand.xml,
+Service-Component: OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.BndMigrationStarter.xml,
  OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.EquinoxMigrationStarter.xml,
- OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.BndMigrationStarter.xml
+ OSGI-INF/org.eclipse.app4mc.amalthea.converters.headless.app.ModelMigrationCommand.xml