diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index 08960071..fd5f3f09 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
index cad99a7e..ff4520f0 100644
--- a/mdx/at_aconet/verbs.xml
+++ b/mdx/at_aconet/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
index 8ca62637..25233449 100644
--- a/mdx/au_aaf/beans.xml
+++ b/mdx/au_aaf/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/au_aaf/verbs.xml b/mdx/au_aaf/verbs.xml
index 7bfa7bf2..fa5b32c8 100644
--- a/mdx/au_aaf/verbs.xml
+++ b/mdx/au_aaf/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
index 9036298a..966628a5 100644
--- a/mdx/be_belnet/beans.xml
+++ b/mdx/be_belnet/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/be_belnet/verbs.xml b/mdx/be_belnet/verbs.xml
index 3cd8cb64..8b714be6 100644
--- a/mdx/be_belnet/verbs.xml
+++ b/mdx/be_belnet/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
index df173aaa..3f420317 100644
--- a/mdx/br_cafe/beans.xml
+++ b/mdx/br_cafe/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/br_cafe/verbs.xml b/mdx/br_cafe/verbs.xml
index 75e77f1c..bcafc354 100644
--- a/mdx/br_cafe/verbs.xml
+++ b/mdx/br_cafe/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
index 4a657872..9740b876 100644
--- a/mdx/ca_caf/beans.xml
+++ b/mdx/ca_caf/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/ca_caf/verbs.xml b/mdx/ca_caf/verbs.xml
index 95c7466e..3b7e8e6a 100644
--- a/mdx/ca_caf/verbs.xml
+++ b/mdx/ca_caf/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
index 4fcad2fe..71ceac41 100644
--- a/mdx/ch_switchaai/beans.xml
+++ b/mdx/ch_switchaai/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/ch_switchaai/verbs.xml b/mdx/ch_switchaai/verbs.xml
index ee363c31..3e32741b 100644
--- a/mdx/ch_switchaai/verbs.xml
+++ b/mdx/ch_switchaai/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 03c0eca8..89381295 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
index 72b10010..800af98d 100644
--- a/mdx/cz_eduid/beans.xml
+++ b/mdx/cz_eduid/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/cz_eduid/verbs.xml b/mdx/cz_eduid/verbs.xml
index 9d4699fc..cc56185e 100644
--- a/mdx/cz_eduid/verbs.xml
+++ b/mdx/cz_eduid/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
index a5504ee6..6c9ee45f 100644
--- a/mdx/de_dfnaai/beans.xml
+++ b/mdx/de_dfnaai/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/de_dfnaai/verbs.xml b/mdx/de_dfnaai/verbs.xml
index 3eeae43c..4e1c8b0e 100644
--- a/mdx/de_dfnaai/verbs.xml
+++ b/mdx/de_dfnaai/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
index 6fdde4ae..43ee1353 100644
--- a/mdx/dk_wayf/beans.xml
+++ b/mdx/dk_wayf/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/dk_wayf/verbs.xml b/mdx/dk_wayf/verbs.xml
index 73fbd8fe..6021dbb2 100644
--- a/mdx/dk_wayf/verbs.xml
+++ b/mdx/dk_wayf/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
index f397f463..70407bfe 100644
--- a/mdx/es_sir/beans.xml
+++ b/mdx/es_sir/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/es_sir/verbs.xml b/mdx/es_sir/verbs.xml
index bbd2cec5..772ad5bd 100644
--- a/mdx/es_sir/verbs.xml
+++ b/mdx/es_sir/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/eu_clarin/beans.xml b/mdx/eu_clarin/beans.xml
index 77adc58d..f5085144 100644
--- a/mdx/eu_clarin/beans.xml
+++ b/mdx/eu_clarin/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/eu_clarin/verbs.xml b/mdx/eu_clarin/verbs.xml
index aab4e118..45de0f1a 100644
--- a/mdx/eu_clarin/verbs.xml
+++ b/mdx/eu_clarin/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
index 28dbe61f..08e3c86e 100644
--- a/mdx/fi_haka/beans.xml
+++ b/mdx/fi_haka/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/fi_haka/verbs.xml b/mdx/fi_haka/verbs.xml
index b9ec6aae..6a48fb8d 100644
--- a/mdx/fi_haka/verbs.xml
+++ b/mdx/fi_haka/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
index cc04cc1f..b6e008fb 100644
--- a/mdx/fr_renater/beans.xml
+++ b/mdx/fr_renater/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/fr_renater/verbs.xml b/mdx/fr_renater/verbs.xml
index 70b24369..368d69d4 100644
--- a/mdx/fr_renater/verbs.xml
+++ b/mdx/fr_renater/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
index 84baefb3..0fab3576 100644
--- a/mdx/gr_grnet/beans.xml
+++ b/mdx/gr_grnet/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/gr_grnet/verbs.xml b/mdx/gr_grnet/verbs.xml
index 2bc0ead9..eb15e7ce 100644
--- a/mdx/gr_grnet/verbs.xml
+++ b/mdx/gr_grnet/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/hr_eduhr/beans.xml b/mdx/hr_eduhr/beans.xml
index 7f35600f..3814fa9d 100644
--- a/mdx/hr_eduhr/beans.xml
+++ b/mdx/hr_eduhr/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/hr_eduhr/verbs.xml b/mdx/hr_eduhr/verbs.xml
index bd3c0900..b8da5bb7 100644
--- a/mdx/hr_eduhr/verbs.xml
+++ b/mdx/hr_eduhr/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
index 97a0fab9..b3eec02f 100644
--- a/mdx/hu_eduid/beans.xml
+++ b/mdx/hu_eduid/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/hu_eduid/verbs.xml b/mdx/hu_eduid/verbs.xml
index c00d0f78..1ccf0227 100644
--- a/mdx/hu_eduid/verbs.xml
+++ b/mdx/hu_eduid/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index b6496379..a522f6de 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/ie_edugate/verbs.xml b/mdx/ie_edugate/verbs.xml
index 8710ade2..6c6c550b 100644
--- a/mdx/ie_edugate/verbs.xml
+++ b/mdx/ie_edugate/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/in_infed/beans.xml b/mdx/in_infed/beans.xml
index 2a96df70..b0a7b0ef 100644
--- a/mdx/in_infed/beans.xml
+++ b/mdx/in_infed/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/in_infed/verbs.xml b/mdx/in_infed/verbs.xml
index 2384a9e6..18a87002 100644
--- a/mdx/in_infed/verbs.xml
+++ b/mdx/in_infed/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index c1610131..ffeb18ab 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index e555130c..c82a9358 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/int_testshib/beans.xml b/mdx/int_testshib/beans.xml
index f123de37..6b3a0512 100644
--- a/mdx/int_testshib/beans.xml
+++ b/mdx/int_testshib/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/int_testshib/verbs.xml b/mdx/int_testshib/verbs.xml
index ed821d85..13cc8036 100644
--- a/mdx/int_testshib/verbs.xml
+++ b/mdx/int_testshib/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
index 8cd65f64..34ee4843 100644
--- a/mdx/it_idem/beans.xml
+++ b/mdx/it_idem/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/it_idem/verbs.xml b/mdx/it_idem/verbs.xml
index f0e1b24d..24e2d456 100644
--- a/mdx/it_idem/verbs.xml
+++ b/mdx/it_idem/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/jp_gakunin/beans.xml b/mdx/jp_gakunin/beans.xml
index 5d84ecb5..7e6da524 100644
--- a/mdx/jp_gakunin/beans.xml
+++ b/mdx/jp_gakunin/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/jp_gakunin/verbs.xml b/mdx/jp_gakunin/verbs.xml
index f1132b7c..9319ff2f 100644
--- a/mdx/jp_gakunin/verbs.xml
+++ b/mdx/jp_gakunin/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
index 8c17a633..6856450f 100644
--- a/mdx/lv_laife/beans.xml
+++ b/mdx/lv_laife/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/lv_laife/verbs.xml b/mdx/lv_laife/verbs.xml
index 5c9fef7c..59665433 100644
--- a/mdx/lv_laife/verbs.xml
+++ b/mdx/lv_laife/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/nl_surfconext/beans.xml b/mdx/nl_surfconext/beans.xml
index c0b0de36..2b8019a2 100644
--- a/mdx/nl_surfconext/beans.xml
+++ b/mdx/nl_surfconext/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/nl_surfconext/verbs.xml b/mdx/nl_surfconext/verbs.xml
index 6eb2f760..3f013a31 100644
--- a/mdx/nl_surfconext/verbs.xml
+++ b/mdx/nl_surfconext/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
index a108110b..eb914e8a 100644
--- a/mdx/nl_surfnet/beans.xml
+++ b/mdx/nl_surfnet/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/nl_surfnet/verbs.xml b/mdx/nl_surfnet/verbs.xml
index d6593391..3baa8e9d 100644
--- a/mdx/nl_surfnet/verbs.xml
+++ b/mdx/nl_surfnet/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/no_feide/beans.xml b/mdx/no_feide/beans.xml
index e2a0279c..bb1c9a12 100644
--- a/mdx/no_feide/beans.xml
+++ b/mdx/no_feide/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/no_feide/verbs.xml b/mdx/no_feide/verbs.xml
index 59550498..d8506121 100644
--- a/mdx/no_feide/verbs.xml
+++ b/mdx/no_feide/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/nz_tuakiri/beans.xml b/mdx/nz_tuakiri/beans.xml
index 2fea3c22..9d4bad1b 100644
--- a/mdx/nz_tuakiri/beans.xml
+++ b/mdx/nz_tuakiri/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/nz_tuakiri/verbs.xml b/mdx/nz_tuakiri/verbs.xml
index 9fd27675..826f44bf 100644
--- a/mdx/nz_tuakiri/verbs.xml
+++ b/mdx/nz_tuakiri/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 9785cf8e..7900a976 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/se_swamid/verbs.xml b/mdx/se_swamid/verbs.xml
index 611795af..d76f1458 100644
--- a/mdx/se_swamid/verbs.xml
+++ b/mdx/se_swamid/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/si_arnes/beans.xml b/mdx/si_arnes/beans.xml
index 2617f3c8..00ee0e10 100644
--- a/mdx/si_arnes/beans.xml
+++ b/mdx/si_arnes/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/si_arnes/verbs.xml b/mdx/si_arnes/verbs.xml
index 5de6e070..05a35a05 100644
--- a/mdx/si_arnes/verbs.xml
+++ b/mdx/si_arnes/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml
index 3a17dd97..facf1941 100644
--- a/mdx/test/beans.xml
+++ b/mdx/test/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml
index 783755de..07be2f1b 100644
--- a/mdx/test/verbs.xml
+++ b/mdx/test/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 0bfeb525..eec45f1b 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index 5fa7d4a4..66da10f6 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 7baff3c2..80965af0 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 8ea64e9e..077d7b05 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/uk_eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
index 99b18737..d376ff4b 100644
--- a/mdx/uk_eduserv/beans.xml
+++ b/mdx/uk_eduserv/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/uk_eduserv/verbs.xml b/mdx/uk_eduserv/verbs.xml
index b3f4d277..d6da5ff6 100644
--- a/mdx/uk_eduserv/verbs.xml
+++ b/mdx/uk_eduserv/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 1a48df83..6e09628c 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index c8b97487..a1227c57 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 7b56fa4b..54830e12 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -4,6 +4,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
+    xmlns:c="http://www.springframework.org/schema/c"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"