diff --git a/.classpath b/.classpath
index 3c5a163..beb601a 100644
--- a/.classpath
+++ b/.classpath
@@ -7,5 +7,6 @@
 	<classpathentry kind="lib" path="lib/commons-beanutils.jar"/>
 	<classpathentry kind="lib" path="lib/juel-2.1.0-rc1.jar"/>
 	<classpathentry kind="lib" path="lib/juel-2.1.0-rc1-impl.jar"/>
+	<classpathentry kind="lib" path="lib/jms-api.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/lib/idcanet-x4o-bin.jar b/lib/idcanet-x4o-bin.jar
index 49d45e8..0adf0b4 100644
Binary files a/lib/idcanet-x4o-bin.jar and b/lib/idcanet-x4o-bin.jar differ
diff --git a/lib/jms-api.jar b/lib/jms-api.jar
new file mode 100644
index 0000000..2cc1a47
Binary files /dev/null and b/lib/jms-api.jar differ
diff --git a/src/META-INF/events.eld b/src/META-INF/foei-events.eld
similarity index 96%
rename from src/META-INF/events.eld
rename to src/META-INF/foei-events.eld
index 7a8a84c..4ffc61b 100644
--- a/src/META-INF/events.eld
+++ b/src/META-INF/foei-events.eld
@@ -24,6 +24,6 @@
 		The views and conclusions contained in the software and documentation are those of the authors and
 		should not be interpreted as representing official policies, either expressed or implied, of IDCA.
 -->
-<eld xmlns:eld="http://x4o.idcanet.com/eld/x4o.eld">
+<eld xmlns:eld="http://x4o.idcanet.com/eld/eld-lang.eld">
 		
 </eld>
\ No newline at end of file
diff --git a/src/META-INF/filters.eld b/src/META-INF/foei-filters.eld
similarity index 96%
rename from src/META-INF/filters.eld
rename to src/META-INF/foei-filters.eld
index 676d2b0..17acc49 100644
--- a/src/META-INF/filters.eld
+++ b/src/META-INF/foei-filters.eld
@@ -24,7 +24,7 @@
 		The views and conclusions contained in the software and documentation are those of the authors and
 		should not be interpreted as representing official policies, either expressed or implied, of IDCA.
 -->
-<eld xmlns:eld="http://x4o.idcanet.com/eld/x4o.eld">
+<eld xmlns:eld="http://x4o.idcanet.com/eld/eld-lang.eld">
 
 	<eld:elementClass tag="filter"			objectClassName="com.idcanet.foei.components.lang.Filter"/>
 	<eld:elementClass tag="stringFilter"	objectClassName="com.idcanet.foei.components.steps.filters.StringFilter"/>
diff --git a/src/META-INF/io.eld b/src/META-INF/foei-io.eld
similarity index 96%
rename from src/META-INF/io.eld
rename to src/META-INF/foei-io.eld
index 2356992..47f0cb0 100644
--- a/src/META-INF/io.eld
+++ b/src/META-INF/foei-io.eld
@@ -24,7 +24,7 @@
 		The views and conclusions contained in the software and documentation are those of the authors and
 		should not be interpreted as representing official policies, either expressed or implied, of IDCA.
 -->
-<eld xmlns:eld="http://x4o.idcanet.com/eld/x4o.eld">
+<eld xmlns:eld="http://x4o.idcanet.com/eld/eld-lang.eld">
 		
 	<eld:elementClass tag="standardOutput"	objectClassName="com.idcanet.foei.components.io.StandardOutput"/>
 	<eld:elementClass tag="errorOutput"		objectClassName="com.idcanet.foei.components.io.ErrorOutput"/>
diff --git a/src/META-INF/lang.eld b/src/META-INF/foei-lang.eld
similarity index 87%
rename from src/META-INF/lang.eld
rename to src/META-INF/foei-lang.eld
index df3d882..80bebb9 100644
--- a/src/META-INF/lang.eld
+++ b/src/META-INF/foei-lang.eld
@@ -24,12 +24,11 @@
 		The views and conclusions contained in the software and documentation are those of the authors and
 		should not be interpreted as representing official policies, either expressed or implied, of IDCA.
 -->
-<eld xmlns:eld="http://x4o.idcanet.com/eld/x4o.eld">
+<eld xmlns:eld="http://x4o.idcanet.com/eld/eld-lang.eld">
 		
-	<eld:elementParameterHandler	parameterName="bind"		bean.src="com.idcanet.foei.core.x4o.BindAttributeHandler" />
-	<eld:elementParameterHandler	parameterName="id"			bean.src="com.idcanet.foei.core.x4o.IdAttributeHandler" />
+	<eld:elementParameterHandler	parameterName="bind"		bean.class="com.idcanet.foei.core.x4o.BindAttributeHandler" />
 	
-	<eld:elementBindingHandler		bean.src="com.idcanet.foei.core.x4o.EventStepBindRuleHandler"/>
+	<eld:elementBindingHandler		bean.class="com.idcanet.foei.core.x4o.EventStepBindRuleHandler"/>
 
 	<eld:elementClass tag="bind"				elementClassName="com.idcanet.foei.core.x4o.ObjectBindingElement"/>
 	<eld:elementClass tag="dummyOutputPort"		objectClassName="com.idcanet.foei.components.lang.DummyOutputPort"/>
diff --git a/src/META-INF/logging.eld b/src/META-INF/foei-logging.eld
similarity index 96%
rename from src/META-INF/logging.eld
rename to src/META-INF/foei-logging.eld
index 778138b..896ae95 100644
--- a/src/META-INF/logging.eld
+++ b/src/META-INF/foei-logging.eld
@@ -24,6 +24,6 @@
 		The views and conclusions contained in the software and documentation are those of the authors and
 		should not be interpreted as representing official policies, either expressed or implied, of IDCA.
 -->
-<eld xmlns:eld="http://x4o.idcanet.com/eld/x4o.eld">
+<eld xmlns:eld="http://x4o.idcanet.com/eld/eld-lang.eld">
 	<eld:elementClass tag="loggerInput" objectClassName="com.idcanet.foei.components.logging.LoggerInput"/>
 </eld>
diff --git a/src/META-INF/foei-namespaces.xml b/src/META-INF/foei-namespaces.xml
index cecfb7f..53f2fe3 100644
--- a/src/META-INF/foei-namespaces.xml
+++ b/src/META-INF/foei-namespaces.xml
@@ -4,10 +4,10 @@
 	<comment>
 		Foei namespace
 	</comment>
-	<entry key="eld.http://foei.idcanet.com/eld/events.eld"		>/META-INF/events.eld</entry>
-	<entry key="eld.http://foei.idcanet.com/eld/filters.eld"	>/META-INF/filters.eld</entry>
-	<entry key="eld.http://foei.idcanet.com/eld/io.eld"			>/META-INF/io.eld</entry>
-	<entry key="eld.http://foei.idcanet.com/eld/lang.eld"		>/META-INF/lang.eld</entry>
-	<entry key="eld.http://foei.idcanet.com/eld/logging.eld"	>/META-INF/logging.eld</entry>
-	<entry key="eld.http://foei.idcanet.com/eld/printers.eld"	>/META-INF/printers.eld</entry>
+	<entry key="eld.http://foei.idcanet.com/eld/foei-events.eld"	>/META-INF/foei-events.eld</entry>
+	<entry key="eld.http://foei.idcanet.com/eld/foei-filters.eld"	>/META-INF/foei-filters.eld</entry>
+	<entry key="eld.http://foei.idcanet.com/eld/foei-io.eld"		>/META-INF/foei-io.eld</entry>
+	<entry key="eld.http://foei.idcanet.com/eld/foei-lang.eld"		>/META-INF/foei-lang.eld</entry>
+	<entry key="eld.http://foei.idcanet.com/eld/foei-logging.eld"	>/META-INF/foei-logging.eld</entry>
+	<entry key="eld.http://foei.idcanet.com/eld/foei-printers.eld"	>/META-INF/foei-printers.eld</entry>
 </properties>
\ No newline at end of file
diff --git a/src/META-INF/printers.eld b/src/META-INF/foei-printers.eld
similarity index 96%
rename from src/META-INF/printers.eld
rename to src/META-INF/foei-printers.eld
index 8aba60e..b2d541e 100644
--- a/src/META-INF/printers.eld
+++ b/src/META-INF/foei-printers.eld
@@ -24,7 +24,7 @@
 		The views and conclusions contained in the software and documentation are those of the authors and
 		should not be interpreted as representing official policies, either expressed or implied, of IDCA.
 -->
-<eld xmlns:eld="http://x4o.idcanet.com/eld/x4o.eld">
+<eld xmlns:eld="http://x4o.idcanet.com/eld/eld-lang.eld">
 
 	<eld:elementClass tag="defaultPrinter"	objectClassName="com.idcanet.foei.components.steps.printers.DefaultPrinter"/>
 	<eld:elementClass tag="datePrinter"		objectClassName="com.idcanet.foei.components.steps.printers.DatePrinter"/>