diff --git a/message-channel/.gitignore b/message-channel/.gitignore
index b83d22266..1dd333108 100644
--- a/message-channel/.gitignore
+++ b/message-channel/.gitignore
@@ -1 +1,2 @@
 /target/
+/target/
diff --git a/message-channel/etc/message-channel.png b/message-channel/etc/message-channel.png
index d29490724..7db473281 100644
Binary files a/message-channel/etc/message-channel.png and b/message-channel/etc/message-channel.png differ
diff --git a/message-channel/etc/message-channel.ucls b/message-channel/etc/message-channel.ucls
index 27e99e539..3ef0ed4bc 100644
--- a/message-channel/etc/message-channel.ucls
+++ b/message-channel/etc/message-channel.ucls
@@ -4,7 +4,7 @@
   <class id="1" language="java" name="org.apache.camel.builder.RouteBuilder" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="59" width="150" x="1016" y="445"/>    
+    <position height="-1" width="-1" x="920" y="458"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -14,7 +14,7 @@
   <interface id="2" language="java" name="org.apache.camel.CamelContext" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="124" x="852" y="445"/>    
+    <position height="-1" width="-1" x="674" y="458"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -24,7 +24,7 @@
   <class id="3" language="java" name="org.apache.camel.model.RouteDefinition" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="147" x="324" y="236"/>    
+    <position height="-1" width="-1" x="673" y="48"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -34,7 +34,7 @@
   <class id="4" language="java" name="org.apache.camel.model.ProcessorDefinition" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="59" width="215" x="246" y="336"/>    
+    <position height="-1" width="-1" x="673" y="-96"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -44,7 +44,7 @@
   <class id="5" language="java" name="org.apache.camel.model.OptionalIdentifiedDefinition" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="59" width="243" x="41" y="236"/>    
+    <position height="-1" width="-1" x="248" y="-96"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -54,7 +54,7 @@
   <interface id="6" language="java" name="org.apache.camel.NamedNode" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="120" x="41" y="336"/>    
+    <position height="-1" width="-1" x="249" y="0"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -64,7 +64,7 @@
   <interface id="7" language="java" name="org.apache.camel.model.Block" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="147" x="246" y="445"/>    
+    <position height="-1" width="-1" x="464" y="13"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -74,7 +74,7 @@
   <interface id="8" language="java" name="org.apache.camel.RoutesBuilder" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="127" x="1016" y="545"/>    
+    <position height="-1" width="-1" x="920" y="590"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -84,7 +84,7 @@
   <class id="9" language="java" name="org.apache.camel.builder.BuilderSupport" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="59" width="150" x="1184" y="336"/>    
+    <position height="-1" width="-1" x="920" y="297"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -94,7 +94,7 @@
   <interface id="10" language="java" name="org.apache.camel.SuspendableService" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="172" x="752" y="336"/>    
+    <position height="-1" width="-1" x="267" y="458"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -104,7 +104,7 @@
   <interface id="11" language="java" name="org.apache.camel.Service" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="120" x="611" y="236"/>    
+    <position height="-1" width="-1" x="267" y="297"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -114,7 +114,7 @@
   <interface id="12" language="java" name="org.apache.camel.RuntimeConfiguration" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="180" x="964" y="336"/>    
+    <position height="-1" width="-1" x="674" y="590"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -124,7 +124,7 @@
   <class id="13" language="java" name="org.apache.camel.impl.DefaultCamelContext" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="175" x="752" y="136"/>    
+    <position height="-1" width="-1" x="673" y="167"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -134,7 +134,7 @@
   <class id="14" language="java" name="org.apache.camel.support.ServiceSupport" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="59" width="154" x="492" y="37"/>    
+    <position height="-1" width="-1" x="265" y="91"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -144,7 +144,7 @@
   <interface id="15" language="java" name="org.apache.camel.StatefulService" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="134" x="532" y="445"/>    
+    <position height="-1" width="-1" x="5" y="188"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -154,7 +154,7 @@
   <interface id="16" language="java" name="org.apache.camel.ShutdownableService" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="180" x="532" y="336"/>    
+    <position height="-1" width="-1" x="265" y="188"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
@@ -164,137 +164,153 @@
   <interface id="17" language="java" name="org.apache.camel.model.ModelCamelContext" project="message-channel" 
     file="C:/Users/ilkka/.m2/repository/org/apache/camel/camel-core/2.15.3/camel-core-2.15.3.jar" binary="true" 
     corner="BOTTOM_RIGHT">    
-    <position height="60" width="168" x="1187" y="545"/>    
+    <position height="-1" width="-1" x="674" y="297"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="false" package="false" protected="false" private="false" static="true"/>      
       <operations public="false" package="false" protected="false" private="false" static="true"/>    
     </display>  
   </interface>  
-  <association id="18">    
-    <bendpoint x="1196" y="445"/>    
+  <generalization id="18">    
+    <end type="SOURCE" refId="4"/>    
+    <end type="TARGET" refId="5"/>  
+  </generalization>  
+  <generalization id="19">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="10"/>  
+  </generalization>  
+  <realization id="20">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="8"/>  
+  </realization>  
+  <association id="21">    
     <end type="SOURCE" refId="9" navigable="false">      
-      <attribute id="19" name="context"/>      
-      <multiplicity id="20" minimum="0" maximum="1"/>    
+      <attribute id="22" name="context">        
+        <position height="0" width="0" x="-583" y="-276"/>      
+      </attribute>      
+      <multiplicity id="23" minimum="0" maximum="1">        
+        <position height="0" width="0" x="-583" y="-276"/>      
+      </multiplicity>    
     </end>    
     <end type="TARGET" refId="17" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
-  <association id="21">    
-    <end type="SOURCE" refId="3" navigable="false">      
-      <attribute id="22" name="outputs"/>      
-      <multiplicity id="23" minimum="0" maximum="2147483647"/>    
+  <association id="24">    
+    <end type="SOURCE" refId="4" navigable="false">      
+      <attribute id="25" name="blocks">        
+        <position height="0" width="0" x="145" y="-462"/>      
+      </attribute>      
+      <multiplicity id="26" minimum="0" maximum="2147483647">        
+        <position height="0" width="0" x="145" y="-462"/>      
+      </multiplicity>    
     </end>    
-    <end type="TARGET" refId="4" navigable="true"/>    
+    <end type="TARGET" refId="7" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
-  <association id="24">    
+  <association id="27">    
     <end type="SOURCE" refId="13" navigable="false">      
-      <attribute id="25" name="servicesToClose"/>      
-      <multiplicity id="26" minimum="0" maximum="2147483647"/>    
+      <attribute id="28" name="servicesToClose">        
+        <position height="0" width="0" x="-409" y="37"/>      
+      </attribute>      
+      <multiplicity id="29" minimum="0" maximum="2147483647">        
+        <position height="0" width="0" x="-409" y="37"/>      
+      </multiplicity>    
     </end>    
     <end type="TARGET" refId="11" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
-  <generalization id="27">    
-    <end type="SOURCE" refId="3"/>    
-    <end type="TARGET" refId="4"/>  
-  </generalization>  
-  <generalization id="28">    
-    <end type="SOURCE" refId="15"/>    
-    <end type="TARGET" refId="10"/>  
-  </generalization>  
-  <generalization id="29">    
-    <end type="SOURCE" refId="16"/>    
-    <end type="TARGET" refId="11"/>  
-  </generalization>  
-  <generalization id="30">    
-    <end type="SOURCE" refId="2"/>    
-    <end type="TARGET" refId="12"/>  
-  </generalization>  
-  <generalization id="31">    
+  <realization id="30">    
     <end type="SOURCE" refId="13"/>    
-    <end type="TARGET" refId="14"/>  
-  </generalization>  
+    <end type="TARGET" refId="17"/>  
+  </realization>  
+  <realization id="31">    
+    <end type="SOURCE" refId="14"/>    
+    <end type="TARGET" refId="15"/>  
+  </realization>  
   <generalization id="32">    
     <end type="SOURCE" refId="17"/>    
     <end type="TARGET" refId="2"/>  
   </generalization>  
   <generalization id="33">    
+    <end type="SOURCE" refId="15"/>    
+    <end type="TARGET" refId="10"/>  
+  </generalization>  
+  <generalization id="34">    
     <end type="SOURCE" refId="1"/>    
     <end type="TARGET" refId="9"/>  
   </generalization>  
-  <association id="34">    
-    <end type="SOURCE" refId="4" navigable="false">      
-      <attribute id="35" name="blocks"/>      
-      <multiplicity id="36" minimum="0" maximum="2147483647"/>    
-    </end>    
-    <end type="TARGET" refId="7" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <realization id="37">    
-    <bendpoint x="761" y="236"/>    
-    <end type="SOURCE" refId="13"/>    
-    <end type="TARGET" refId="10"/>  
-  </realization>  
-  <generalization id="38">    
-    <end type="SOURCE" refId="2"/>    
-    <end type="TARGET" refId="10"/>  
+  <generalization id="35">    
+    <end type="SOURCE" refId="3"/>    
+    <end type="TARGET" refId="4"/>  
   </generalization>  
-  <realization id="39">    
-    <bendpoint x="1364" y="236"/>    
-    <bendpoint x="1364" y="336"/>    
-    <bendpoint x="1364" y="445"/>    
-    <end type="SOURCE" refId="13"/>    
-    <end type="TARGET" refId="17"/>  
-  </realization>  
-  <generalization id="40">    
-    <end type="SOURCE" refId="4"/>    
-    <end type="TARGET" refId="5"/>  
+  <generalization id="36">    
+    <end type="SOURCE" refId="16"/>    
+    <end type="TARGET" refId="11"/>  
   </generalization>  
-  <realization id="41">    
-    <end type="SOURCE" refId="4"/>    
-    <end type="TARGET" refId="7"/>  
-  </realization>  
-  <generalization id="42">    
+  <generalization id="37">    
     <end type="SOURCE" refId="15"/>    
     <end type="TARGET" refId="16"/>  
   </generalization>  
-  <association id="43">    
-    <end type="SOURCE" refId="13" navigable="false">      
-      <attribute id="44" name="routeDefinitions"/>      
-      <multiplicity id="45" minimum="0" maximum="2147483647"/>    
-    </end>    
-    <end type="TARGET" refId="3" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <realization id="46">    
-    <end type="SOURCE" refId="1"/>    
-    <end type="TARGET" refId="8"/>  
-  </realization>  
-  <generalization id="47">    
+  <generalization id="38">    
     <end type="SOURCE" refId="10"/>    
     <end type="TARGET" refId="11"/>  
   </generalization>  
-  <realization id="48">    
-    <bendpoint x="501" y="136"/>    
-    <bendpoint x="501" y="236"/>    
-    <bendpoint x="501" y="336"/>    
-    <end type="SOURCE" refId="14"/>    
-    <end type="TARGET" refId="15"/>  
+  <realization id="39">    
+    <end type="SOURCE" refId="4"/>    
+    <end type="TARGET" refId="7"/>  
   </realization>  
-  <association id="49">    
+  <association id="40">    
     <end type="SOURCE" refId="4" navigable="false">      
-      <attribute id="50" name="parent"/>      
-      <multiplicity id="51" minimum="0" maximum="1"/>    
+      <attribute id="41" name="parent">        
+        <position height="0" width="0" x="329" y="-461"/>      
+      </attribute>      
+      <multiplicity id="42" minimum="0" maximum="1">        
+        <position height="0" width="0" x="329" y="-461"/>      
+      </multiplicity>    
     </end>    
     <end type="TARGET" refId="4" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
-  <realization id="52">    
+  <realization id="43">    
     <end type="SOURCE" refId="5"/>    
     <end type="TARGET" refId="6"/>  
   </realization>  
+  <generalization id="44">    
+    <end type="SOURCE" refId="2"/>    
+    <end type="TARGET" refId="12"/>  
+  </generalization>  
+  <generalization id="45">    
+    <end type="SOURCE" refId="13"/>    
+    <end type="TARGET" refId="14"/>  
+  </generalization>  
+  <association id="46">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="47" name="outputs">        
+        <position height="0" width="0" x="329" y="-461"/>      
+      </attribute>      
+      <multiplicity id="48" minimum="0" maximum="2147483647">        
+        <position height="0" width="0" x="329" y="-461"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="4" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="49">    
+    <end type="SOURCE" refId="13" navigable="false">      
+      <attribute id="50" name="routeDefinitions">        
+        <position height="0" width="0" x="291" y="-218"/>      
+      </attribute>      
+      <multiplicity id="51" minimum="0" maximum="2147483647">        
+        <position height="0" width="0" x="291" y="-218"/>      
+      </multiplicity>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <realization id="52">    
+    <end type="SOURCE" refId="13"/>    
+    <end type="TARGET" refId="10"/>  
+  </realization>  
   <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
     sort-features="false" accessors="true" visibility="true">    
     <attributes public="false" package="false" protected="false" private="false" static="true"/>