diff --git a/modules/core/src/main/java/org/apache/savan/module/SavanModule.java b/modules/core/src/main/java/org/apache/savan/module/SavanModule.java
index 07167dd..2341853 100644
--- a/modules/core/src/main/java/org/apache/savan/module/SavanModule.java
+++ b/modules/core/src/main/java/org/apache/savan/module/SavanModule.java
@@ -51,7 +51,7 @@
         ConfigurationManager configurationManager = new ConfigurationManager();
         try {
             ClassLoader moduleClassLoader = module.getModuleClassLoader();
-            configurationManager.configure(getClass().getClassLoader());
+            configurationManager.configure(moduleClassLoader);
         } catch (SavanException e) {
             log.error("Exception thrown while trying to configure the Savan module", e);
         }
diff --git a/modules/mar/module.xml b/modules/mar/module.xml
index 05636b1..5eed28d 100644
--- a/modules/mar/module.xml
+++ b/modules/mar/module.xml
@@ -1,24 +1,24 @@
-<module name="Savan" class="org.apache.savan.module.SavanModule">
-
-  <operation name="SavanInOutOperation" mep="http://www.w3.org/2004/08/wsdl/in-out">
-    <messageReceiver class="org.apache.savan.messagereceiver.SavanInOutMessageReceiver"/>
-    <actionMapping>http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe</actionMapping>
-    <actionMapping>http://schemas.xmlsoap.org/ws/2004/08/eventing/Renew</actionMapping>
-    <actionMapping>http://schemas.xmlsoap.org/ws/2004/08/eventing/GetStatus</actionMapping>
-    <actionMapping>http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe</actionMapping>
-    <actionMapping>http://wso2.com/eventing/Subscribe</actionMapping>
-    <actionMapping>http://wso2.com/eventing/Renew</actionMapping>
-    <actionMapping>http://wso2.com/eventing/Unsubscribe</actionMapping>
-    <actionMapping>http://wso2.com/eventing/GetStatus</actionMapping>
-  </operation>
-
-  <operation name="atom" mep="http://www.w3.org/2004/08/wsdl/in-out">
-    <messageReceiver class="org.apache.savan.atom.AtomMessageReceiver"/>
-  </operation>
-
-  <operation name="publish" mep="http://www.w3.org/2004/08/wsdl/in-out">
-    <messageReceiver class="org.apache.savan.messagereceiver.PublishingMessageReceiver"/>
-    <actionMapping>http://ws.apache.org/ws/2007/05/eventing-extended/Publish</actionMapping>
-  </operation>
-
-</module>
+<module name="savan" class="org.apache.savan.module.SavanModule">
+
+  <operation name="SavanInOutOperation" mep="http://www.w3.org/2004/08/wsdl/in-out">
+    <messageReceiver class="org.apache.savan.messagereceiver.SavanInOutMessageReceiver"/>
+    <actionMapping>http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe</actionMapping>
+    <actionMapping>http://schemas.xmlsoap.org/ws/2004/08/eventing/Renew</actionMapping>
+    <actionMapping>http://schemas.xmlsoap.org/ws/2004/08/eventing/GetStatus</actionMapping>
+    <actionMapping>http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe</actionMapping>
+    <actionMapping>http://wso2.com/eventing/Subscribe</actionMapping>
+    <actionMapping>http://wso2.com/eventing/Renew</actionMapping>
+    <actionMapping>http://wso2.com/eventing/Unsubscribe</actionMapping>
+    <actionMapping>http://wso2.com/eventing/GetStatus</actionMapping>
+  </operation>
+
+  <operation name="atom" mep="http://www.w3.org/2004/08/wsdl/in-out">
+    <messageReceiver class="org.apache.savan.atom.AtomMessageReceiver"/>
+  </operation>
+
+  <operation name="publish" mep="http://www.w3.org/2004/08/wsdl/in-out">
+    <messageReceiver class="org.apache.savan.messagereceiver.PublishingMessageReceiver"/>
+    <actionMapping>http://ws.apache.org/ws/2007/05/eventing-extended/Publish</actionMapping>
+  </operation>
+
+</module>