diff --git a/introspector/features/org.polarsys.kitalpha.pdt.docgen.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.docgen.feature/feature.xml
index 0d83590..6f28ff5 100644
--- a/introspector/features/org.polarsys.kitalpha.pdt.docgen.feature/feature.xml
+++ b/introspector/features/org.polarsys.kitalpha.pdt.docgen.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.docgen.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.pdt.modeler.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.pdt.modeler.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/introspector/features/org.polarsys.kitalpha.pdt.docgen.ui.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.docgen.ui.feature/feature.xml
index b4988b0..943cb20 100644
--- a/introspector/features/org.polarsys.kitalpha.pdt.docgen.ui.feature/feature.xml
+++ b/introspector/features/org.polarsys.kitalpha.pdt.docgen.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.docgen.ui.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.pdt.docgen.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.pdt.docgen.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/introspector/features/org.polarsys.kitalpha.pdt.introspector.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.introspector.feature/feature.xml
index 9d8f146..1b5a1af 100644
--- a/introspector/features/org.polarsys.kitalpha.pdt.introspector.feature/feature.xml
+++ b/introspector/features/org.polarsys.kitalpha.pdt.introspector.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.introspector.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.resourcereuse.emfscheme.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.resourcereuse.emfscheme.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/introspector/features/org.polarsys.kitalpha.pdt.introspector.ui.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.introspector.ui.feature/feature.xml
index cd098ab..fdda0ab 100644
--- a/introspector/features/org.polarsys.kitalpha.pdt.introspector.ui.feature/feature.xml
+++ b/introspector/features/org.polarsys.kitalpha.pdt.introspector.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.introspector.ui.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.pdt.introspector.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.pdt.introspector.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/introspector/features/org.polarsys.kitalpha.pdt.metamodel.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.metamodel.feature/feature.xml
index 1dafd59..27ceb98 100644
--- a/introspector/features/org.polarsys.kitalpha.pdt.metamodel.feature/feature.xml
+++ b/introspector/features/org.polarsys.kitalpha.pdt.metamodel.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.metamodel.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/introspector/features/org.polarsys.kitalpha.pdt.modeler.feature/feature.xml b/introspector/features/org.polarsys.kitalpha.pdt.modeler.feature/feature.xml
index 8efa9be..bd68dae 100644
--- a/introspector/features/org.polarsys.kitalpha.pdt.modeler.feature/feature.xml
+++ b/introspector/features/org.polarsys.kitalpha.pdt.modeler.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.polarsys.kitalpha.pdt.modeler.feature"
       label="%featureName"
-      version="5.1.0.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.polarsys.kitalpha.pdt.introspector.feature" version="5.1.0.qualifier"/>
+      <import feature="org.polarsys.kitalpha.pdt.introspector.feature" version="6.0.0.qualifier"/>
    </requires>
 
    <plugin
diff --git a/introspector/features/pom.xml b/introspector/features/pom.xml
index a01c00f..7bed52b 100644
--- a/introspector/features/pom.xml
+++ b/introspector/features/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.kitalpha.addons</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 </project>
\ No newline at end of file
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.ui/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.ui/META-INF/MANIFEST.MF
index 1d67a4f..d0b4c97 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.ui/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.docgen.ui;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.docgen.internal.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.wizard/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.wizard/META-INF/MANIFEST.MF
index 5037d5f..556e71a 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.wizard/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.docgen.wizard/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Gen Doc HTML wizard
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.docgen.wizard
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.docgen.internal.wizard.Activator
 Bundle-Vendor: THALESGROUP
 Require-Bundle: org.eclipse.ui,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.docgen/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.docgen/META-INF/MANIFEST.MF
index 757a0a1..c0b6eee 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.docgen/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.docgen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.docgen;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.internal.docgen.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.core/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.core/META-INF/MANIFEST.MF
index 71e2222..67cacb6 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.core/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.introspector.core;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.pde.core,
  org.eclipse.ui,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.preferences/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.preferences/META-INF/MANIFEST.MF
index 0bd9e50..86cae0c 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.preferences/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.preferences/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.introspector.preferences;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.introspector.internal.preferences.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.ui/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.ui/META-INF/MANIFEST.MF
index 1818d00..590e4df 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.ui/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.introspector.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Introspector UI
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.introspector.ui;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.introspector.internal.ui.Activator
 Bundle-Vendor: THALESGROUP
 Require-Bundle: org.eclipse.ui,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.edit/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.edit/META-INF/MANIFEST.MF
index 5d368f2..edbddbb 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.edit/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.metamodel.edit;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.polarsys.kitalpha.pdt.metamodel.edit.provider.PlatformEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.editor/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.editor/META-INF/MANIFEST.MF
index fab9e4d..8695723 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.editor/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.metamodel.editor;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.polarsys.kitalpha.pdt.metamodel.editor.presentation.PlatformEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.gen/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.gen/META-INF/MANIFEST.MF
index 4c387b5..aaa36c0 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.gen/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.gen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.metamodel.gen;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.metamodel.internal.gen.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.model/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.model/META-INF/MANIFEST.MF
index e84f7c4..8861c22 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.model/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.metamodel.model;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.validation/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.validation/META-INF/MANIFEST.MF
index db59b88..c15847a 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.validation/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Constraints
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.metamodel.validation;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.metamodel.validation.internal.constraints.Activator
 Bundle-Vendor: THALESGROUP
 Require-Bundle: org.eclipse.ui,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel/META-INF/MANIFEST.MF
index ed13da7..e893e64 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.metamodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.metamodel;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Require-Bundle: org.eclipse.emf.ecore
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.design/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.design/META-INF/MANIFEST.MF
index bdfb746..13d1690 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.design/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.design/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.modeler.design;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.internal.modeler.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.resources/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.resources/META-INF/MANIFEST.MF
index 97d2a4d..620b97d 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.resources/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.modeler.resources;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.polarsys.kitalpha.pdt.internal.resources.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.utils/META-INF/MANIFEST.MF b/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.utils/META-INF/MANIFEST.MF
index 2bd8b5c..b681742 100644
--- a/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.utils/META-INF/MANIFEST.MF
+++ b/introspector/plugins/org.polarsys.kitalpha.pdt.modeler.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.polarsys.kitalpha.pdt.modeler.utils
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.kitalpha.pdt.metamodel.model,
diff --git a/introspector/plugins/pom.xml b/introspector/plugins/pom.xml
index 63fb95b..2047f5d 100644
--- a/introspector/plugins/pom.xml
+++ b/introspector/plugins/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.kitalpha.addons</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 </project>
diff --git a/pom.xml b/pom.xml
index 339eca7..3489fa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.polarsys</groupId>
 	<artifactId>org.polarsys.kitalpha.addons</artifactId>
-	<version>5.1.0-SNAPSHOT</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -28,6 +28,7 @@
 
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
+		<sourcePhase>package</sourcePhase>
 
 		<!-- for junit -->
 		<tycho.testArgLine>-Xms256m -Xmx1024m</tycho.testArgLine>
@@ -189,11 +190,12 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<executionEnvironment>JavaSE-14</executionEnvironment>
+					<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
 					<target>
 						<artifact>
 							<groupId>org.polarsys</groupId>
 							<artifactId>introspector</artifactId>
-							<version>5.1.0-SNAPSHOT</version>
+							<version>6.0.0-SNAPSHOT</version>
 							<classifier>introspector</classifier>
 						</artifact>
 					</target>
@@ -216,21 +218,25 @@
 					</environments>
 				</configuration>
 			</plugin>
+			
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho-version}</version>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+				</configuration>
 				<executions>
 					<execution>
 						<id>plugin-source</id>
+						<phase>${sourcePhase}</phase>
 						<goals>
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
 				</executions>
-				<configuration>
-					<strictSrcIncludes>false</strictSrcIncludes>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
@@ -240,14 +246,6 @@
 					<archive>
 						<addMavenDescriptor>false</addMavenDescriptor>
 					</archive>
-					<excludes>
-						<feature id="org.polarsys.kitalpha.pdt.docgen.feature"/>
-						<feature id="org.polarsys.kitalpha.pdt.docgen.ui.feature"/>
-						<feature id="org.polarsys.kitalpha.pdt.introspector.feature"/>
-						<feature id="org.polarsys.kitalpha.pdt.introspector.ui.feature"/>
-						<feature id="org.polarsys.kitalpha.pdt.metamodel.feature"/>
-						<feature id="org.polarsys.kitalpha.pdt.modeler.feature"/>
-					</excludes>
 				</configuration>
 				<executions>
 					<execution>
diff --git a/releng/org.polarsys.kitalpha.pdt.introspector.targets/pom.xml b/releng/org.polarsys.kitalpha.pdt.introspector.targets/pom.xml
index db3b078..90825d4 100644
--- a/releng/org.polarsys.kitalpha.pdt.introspector.targets/pom.xml
+++ b/releng/org.polarsys.kitalpha.pdt.introspector.targets/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.kitalpha.addons</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/category.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/category.xml
index f918d05..cb172d1 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/category.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/category.xml
@@ -18,9 +18,28 @@
    <feature id="org.polarsys.kitalpha.pdt.modeler.feature" version="0.0.0">
       <category name="org.polarsys.kitalpha.pdt.all"/>
    </feature>
+   <feature id="org.polarsys.kitalpha.pdt.docgen.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.all.source"/>
+   </feature>
+   <feature id="org.polarsys.kitalpha.pdt.docgen.ui.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.all.source"/>
+   </feature>
+   <feature id="org.polarsys.kitalpha.pdt.introspector.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.all.source"/>
+   </feature>
+   <feature id="org.polarsys.kitalpha.pdt.introspector.ui.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.all.source"/>
+   </feature>
+   <feature id="org.polarsys.kitalpha.pdt.metamodel.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.all.source"/>
+   </feature>
+   <feature id="org.polarsys.kitalpha.pdt.modeler.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.all.source"/>
+   </feature>
    <category-def name="org.polarsys.kitalpha.pdt.all" label="PDT Tooling">
       <description>
          Installation of Models, Modeler, docGen and introspector
       </description>
    </category-def>
+   <category-def name="org.polarsys.kitalpha.pdt.all.source" label="PDT Tooling Source"/>
 </site>
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/pom.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/pom.xml
index 55a4ba8..61c5588 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/pom.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.kitalpha.addons</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../../../../</relativePath>
 	</parent>
 	
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.docgen.site/category.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.docgen.site/category.xml
index d4dcfc1..addd806 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.docgen.site/category.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.docgen.site/category.xml
@@ -7,4 +7,11 @@
       <category name="org.polarsys.kitalpha.pdt.docgen"/>
    </feature>
    <category-def name="org.polarsys.kitalpha.pdt.docgen" label="DocGen"/>
+   <feature id="org.polarsys.kitalpha.pdt.docgen.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.docgen.source"/>
+   </feature>
+   <feature id="org.polarsys.kitalpha.pdt.docgen.ui.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.docgen.source"/>
+   </feature>
+   <category-def name="org.polarsys.kitalpha.pdt.docgen.source" label="DocGen Source"/>
 </site>
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.docgen.site/pom.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.docgen.site/pom.xml
index 36cb1c7..0e846de 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.docgen.site/pom.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.docgen.site/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.kitalpha.addons</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../../../../</relativePath>
 	</parent>
 	
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.model.site/category.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.model.site/category.xml
index 5b3adef..9771b91 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.model.site/category.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.model.site/category.xml
@@ -4,4 +4,8 @@
       <category name="org.polarsys.kitalpha.pdt.model"/>
    </feature>
    <category-def name="org.polarsys.kitalpha.pdt.model" label="Model"/>
+   <feature id="org.polarsys.kitalpha.pdt.metamodel.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.model.source"/>
+   </feature>
+   <category-def name="org.polarsys.kitalpha.pdt.model.source" label="Model Source"/>
 </site>
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.model.site/pom.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.model.site/pom.xml
index 93d3763..6b35008 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.model.site/pom.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.model.site/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.kitalpha.addons</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../../../../</relativePath>
 	</parent>
 	
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.modeler.site/category.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.modeler.site/category.xml
index 6a51ead..6730b14 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.modeler.site/category.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.modeler.site/category.xml
@@ -4,4 +4,8 @@
       <category name="org.polarsys.kitalpha.pdt.introspector.modeler"/>
    </feature>
    <category-def name="org.polarsys.kitalpha.pdt.introspector.modeler" label="Introspector Modeler"/>
+   <feature id="org.polarsys.kitalpha.pdt.modeler.feature.source" version="0.0.0">
+      <category name="org.polarsys.kitalpha.pdt.introspector.modeler.source"/>
+   </feature>
+   <category-def name="org.polarsys.kitalpha.pdt.introspector.modeler.source" label="Introspector Modeler Source"/>
 </site>
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.modeler.site/pom.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.modeler.site/pom.xml
index e21ebbb..7046785 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.modeler.site/pom.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.modeler.site/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.kitalpha.addons</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../../../../</relativePath>
 	</parent>
 	
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.site/category.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.site/category.xml
index 2800f9b..bb32d5b 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.site/category.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.site/category.xml
@@ -6,12 +6,12 @@
    <feature id="org.polarsys.kitalpha.pdt.introspector.ui.feature" version="0.0.0">
       <category name="org.polarsys.kitalpha.pdt.introspector"/>
    </feature>
-   <!-- <feature url="features/org.polarsys.kitalpha.pdt.introspector.feature_5.1.0.qualifier.jar" id="org.polarsys.kitalpha.pdt.introspector.feature.source" version="5.1.0.qualifier">
+   <feature id="org.polarsys.kitalpha.pdt.introspector.feature.source" version="0.0.0">
       <category name="org.polarsys.kitalpha.pdt.introspector.source"/>
    </feature>
-   <feature url="features/org.polarsys.kitalpha.pdt.introspector.ui.feature_5.1.0.qualifier.jar" id="org.polarsys.kitalpha.pdt.introspector.ui.feature.source" version="5.1.0.qualifier">
+   <feature id="org.polarsys.kitalpha.pdt.introspector.ui.feature.source" version="0.0.0">
       <category name="org.polarsys.kitalpha.pdt.introspector.source"/>
-   </feature> -->
+   </feature>
    <category-def name="org.polarsys.kitalpha.pdt.introspector" label="Introspector"/>
-   <!-- <category-def name="org.polarsys.kitalpha.pdt.introspector.source" label="Introspector Sources"/> -->
+   <category-def name="org.polarsys.kitalpha.pdt.introspector.source" label="Introspector Sources"/>
 </site>
diff --git a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.site/pom.xml b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.site/pom.xml
index d56c8fa..2a66cab 100644
--- a/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.site/pom.xml
+++ b/releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.site/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.polarsys</groupId>
 		<artifactId>org.polarsys.kitalpha.addons</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 		<relativePath>../../../../</relativePath>
 	</parent>