diff --git a/joram/assembly/osgi-assembly.xml b/joram/assembly/osgi-assembly.xml
index 11233a4839ad7628aee33eb839300d9b181f6e66..73dbcfc166d68fea73138ea3ea941831e1463e68 100644
--- a/joram/assembly/osgi-assembly.xml
+++ b/joram/assembly/osgi-assembly.xml
@@ -30,6 +30,7 @@
         <include>org.ow2.spec.ee:ow2-jms-2.0-spec</include>
         <include>org.ow2.spec.ee:ow2-jta-1.1-spec</include>
         <include>org.objectweb.joram:jcup</include>
+        <!-- Joram -->
         <include>org.ow2.joram:joram-shared</include>
         <include>org.ow2.joram:joram-mom-core</include>
         <include>org.ow2.joram:joram-client-jms</include>
@@ -41,6 +42,7 @@
         <include>org.ow2.joram:jndi-server</include>
         <include>org.ow2.joram:jndi-client</include>
         <include>org.ow2.jonas.osgi:monolog</include>
+        <!-- Joram extensions and tools -->
         <include>org.ow2.joram:joram-mom-extensions-amqp</include>
         <include>commons-io:commons-io</include>
         <include>org.ow2.joram:joram-mom-extensions-ftp</include>
@@ -53,7 +55,9 @@
         <include>org.ow2.joram:joram-tools-rest-admin</include>
         <include>org.ow2.joram:joram-tools-rest-jms</include>
         <include>org.ow2.joram:joram-tools-rest-jmx</include>
+        <include>org.ow2.joram:joram-tools-jmscheck</include>
         <include>org.ow2.joram:joram-tools-monitoring</include>
+        <!-- Felix -->
         <include>org.apache.felix:org.apache.felix.shell</include>
         <include>org.apache.felix:org.apache.felix.shell.remote</include>
         <include>org.apache.felix:org.apache.felix.shell.tui</include>
@@ -61,11 +65,15 @@
         <include>org.apache.felix:org.apache.felix.gogo.command</include>
         <include>org.apache.felix:org.apache.felix.gogo.shell</include>
         <include>org.osgi:org.osgi.compendium</include>
+        <!--  -->
         <include>org.ow2.joram:joram-mom-amqp</include>
+        <!-- Joram shell extensions -->
         <include>org.ow2.joram:shell-mom</include>
         <include>org.ow2.joram:shell-jndi</include>
         <include>org.ow2.joram:shell-a3</include>
+        <!--  -->
         <include>org.ow2.util.substitution:substitution</include>
+        <!-- Jersey -->
         <include>javax.activation:activation</include>
         <include>javax.xml.bind:jaxb-api</include>
         <include>org.glassfish.jersey.core:jersey-server</include>
diff --git a/joram/assembly/pom.xml b/joram/assembly/pom.xml
index 7649710d3fafcf1470a3b99d8eea21095f2d2a0c..4b0686b76dba2cfeaed022b263bc764f3b73e320 100644
--- a/joram/assembly/pom.xml
+++ b/joram/assembly/pom.xml
@@ -76,6 +76,7 @@
 			<groupId>org.ow2.jonas.osgi</groupId>
 			<artifactId>monolog</artifactId>
 		</dependency>
+    <!-- Joram base -->
 		<dependency>
 			<groupId>org.objectweb.joram</groupId>
 			<artifactId>jcup</artifactId>
@@ -146,6 +147,7 @@
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
+		<!-- Joram extension -->
 		<dependency>
 			<groupId>org.ow2.joram</groupId>
 			<artifactId>joram-mom-extensions-amqp</artifactId>
@@ -192,6 +194,7 @@
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
+		<!-- Joram tools -->
 		<dependency>
 			<groupId>org.ow2.joram</groupId>
 			<artifactId>joram-tools-jasp</artifactId>
@@ -224,10 +227,21 @@
 		</dependency>
 		<dependency>
 			<groupId>org.ow2.joram</groupId>
+      <artifactId>joram-tools-jmscheck</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+		<dependency>
+			<groupId>org.ow2.joram</groupId>
 			<artifactId>joram-tools-monitoring</artifactId>
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
+    <!-- Felix main and shell -->
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.main</artifactId>
+    </dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.shell</artifactId>
@@ -240,11 +254,8 @@
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.shell.tui</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.main</artifactId>
-		</dependency>
 
+    <!-- Felix Gogo Shell -->
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.gogo.runtime</artifactId>
@@ -266,6 +277,7 @@
 			<groupId>org.ow2.spec.ee</groupId>
 			<artifactId>ow2-connector-1.5-spec</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
@@ -288,11 +300,14 @@
 			<version>${project.version}</version>
 			<type>jar</type>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.compendium</artifactId>
 			<type>jar</type>
 		</dependency>
+		
+		<!-- Joram shell extensions -->
 		<dependency>
 			<groupId>org.ow2.joram</groupId>
 			<artifactId>shell-mom</artifactId>
@@ -308,6 +323,7 @@
 			<artifactId>shell-a3</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.ow2.util.substitution</groupId>
 			<artifactId>substitution</artifactId>
@@ -328,6 +344,7 @@
 			<version>2.3.1</version>
 		</dependency>
 
+    <!-- Jersey -->
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>
 			<artifactId>jersey-server</artifactId>