diff --git a/org.eclipse.emf.ecoretools.build/pom.xml b/org.eclipse.emf.ecoretools.build/pom.xml
index 8b5c699..de01f92 100644
--- a/org.eclipse.emf.ecoretools.build/pom.xml
+++ b/org.eclipse.emf.ecoretools.build/pom.xml
@@ -54,6 +54,8 @@
         <module>../org.eclipse.emf.ecoretools.registration</module>    
         <module>../org.eclipse.emf.ecoretools.sdk-feature</module>
         <module>../org.eclipse.emf.ecoretools.tabbedproperties</module>
+        <module>../org.eclipse.emf.ecoretools.explorer.contextual</module>
+        <module>../org.eclipse.emf.ecoretools.explorer.contextual-feature</module>
         <module>../org.eclipse.emf.ecoretools.update</module>
         <module>../org.eclipse.emf.ecoretools.update-all</module>
     </modules>
@@ -195,6 +197,9 @@
                  <repository><id>acceleo for AQL</id><layout>p2</layout>
                      <url>http://download.eclipse.org/acceleo/updates/milestones/3.6</url>
                 </repository>
+                <repository><id>amalgam</id><layout>p2</layout>
+                    <url>http://download.eclipse.org/modeling/amalgam/updates/nightly/1.7.x/mars/</url>
+                </repository>
                 <repository><id>rest-of-the-world</id><layout>p2</layout>
                     <url>http://download.eclipse.org/releases/staging</url>
                 </repository>
@@ -215,6 +220,9 @@
                  <repository><id>acceleo for AQL</id><layout>p2</layout>
                      <url>http://download.eclipse.org/acceleo/updates/milestones/3.6</url>
                 </repository>
+                <repository><id>amalgam</id><layout>p2</layout>
+                    <url>http://download.eclipse.org/modeling/amalgam/updates/nightly/1.7.x/mars/</url>
+                </repository>
                 <repository><id>rest-of-the-world</id><layout>p2</layout>
                     <url>http://download.eclipse.org/releases/mars</url>
                 </repository>
@@ -235,6 +243,9 @@
                  <repository><id>acceleo for AQL</id><layout>p2</layout>
                     <url>http://download.eclipse.org/sirius/updates/stable/3.0.0-S20150504-101721/mars</url>
                 </repository>
+                <repository><id>amalgam</id><layout>p2</layout>
+                    <url>http://download.eclipse.org/modeling/amalgam/updates/nightly/1.7.x/mars/</url>
+                </repository>
                 <repository><id>rest-of-the-world</id><layout>p2</layout>
                     <url>http://download.eclipse.org/releases/staging</url>
                 </repository>
diff --git a/org.eclipse.emf.ecoretools.explorer.contextual/pom.xml b/org.eclipse.emf.ecoretools.explorer.contextual/pom.xml
new file mode 100644
index 0000000..0706d3d
--- /dev/null
+++ b/org.eclipse.emf.ecoretools.explorer.contextual/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2011, Cedric Brun <cedric.brun@obeo.fr>
+   
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+    <groupId>org.eclipse.emf.ecoretools</groupId>
+    <artifactId>emf.ecoretools-parent</artifactId>
+    <version>3.1.0-SNAPSHOT</version>
+    <relativePath>../org.eclipse.emf.ecoretools.build</relativePath>
+  </parent>
+        
+
+  <artifactId>org.eclipse.emf.ecoretools.explorer.contextual</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+  
+  <version>3.1.0-SNAPSHOT</version>
+
+ <build>
+     <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
+     <resources>
+      <resource>
+        <directory>src</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
+      </plugin>      
+    </plugins>
+  </build>
+
+</project>
diff --git a/org.eclipse.emf.ecoretools.update/category.xml b/org.eclipse.emf.ecoretools.update/category.xml
index ba715da..e724cb0 100644
--- a/org.eclipse.emf.ecoretools.update/category.xml
+++ b/org.eclipse.emf.ecoretools.update/category.xml
@@ -3,6 +3,9 @@
    <feature id="org.eclipse.emf.ecoretools.design" version="3.1.0.qualifier">
       <category name="ecoretools"/>
    </feature>     
+   <feature id="org.eclipse.emf.ecoretools.explorer.contextual" version="3.1.0.qualifier">
+       <category name="ecoretools"/>
+   </feature>
    <feature  id="org.eclipse.emf.ecoretools.sdk" version="3.1.0.qualifier">
       <category name="ecoretools"/>
    </feature>