diff --git a/DE.xml b/DE.xml
index 505528f6102118aa83060e5baea32f66295fc26b..09ad822fc33be9455f4db3c6788615a039ade652 100644
--- a/DE.xml
+++ b/DE.xml
@@ -136,6 +136,14 @@
         roaming_protocol="IPV4V6"
         type="default,supl,xcap"
     />
+    <apn
+        mcc="262"
+        mnc="02"
+        carrier="Vodafone DE-IMS"
+        apn="ims"
+        protocol="IPV4V6"
+        type="ims"
+    />
     <apn
         mcc="262"
         mnc="02"
@@ -338,6 +346,133 @@
         roaming_protocol="IPV4V6"
         type="ims"
     />
+    <apn
+        mcc="262"
+        mnc="23"
+        carrier="1and1 IMS"
+        apn="ims"
+        carrier_id="2536"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        type="ims"
+        user_visible="false"
+    />
+    <apn
+        mcc="262"
+        mnc="23"
+        carrier="1and1 Internet"
+        apn="internet"
+        carrier_id="2536"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        type="default,ia,supl"
+    />
+    <apn
+        mcc="262"
+        mnc="23"
+        carrier="1and1 MMS"
+        apn="mms"
+        carrier_id="2536"
+        mmsc="http://mms.1und1-mobilfunk.de/"
+        mmsport="80"
+        mmsproxy="2a00:0fbc:2200:c999:0109:1f87:2:1"
+        protocol="IPV6"
+        roaming_protocol="IPV6"
+        type="mms"
+    />
+    <apn
+        mcc="262"
+        mnc="23"
+        carrier="1and1 XCAP"
+        apn="hos"
+        carrier_id="2536"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        type="xcap"
+        user_visible="false"
+    />
+    <apn
+        mcc="262"
+        mnc="23"
+        carrier="SmartMobil IMS"
+        apn="ims"
+        mmsc=""
+        mmsport=""
+        mmsproxy=""
+        mvno_match_data=""
+        password=""
+        port=""
+        protocol="IPV6"
+        proxy=""
+        roaming_protocol="IPV6"
+        server=""
+        type="ims"
+        user=""
+        user_editable="false"
+        user_visible="false"
+    />
+    <apn
+        mcc="262"
+        mnc="23"
+        carrier="SmartMobil MMS"
+        apn="mms"
+        mmsc="http://mms.1und1-mobilfunk.de"
+        mmsport="80"
+        mmsproxy="2a00:0fbc:2200:c999:0109:1f87:2:1"
+        mvno_match_data=""
+        password=""
+        port=""
+        protocol="IPV6"
+        proxy=""
+        roaming_protocol="IPV6"
+        server=""
+        type="mms"
+        user=""
+        user_editable="true"
+        user_visible="true"
+    />
+    <apn
+        mcc="262"
+        mnc="23"
+        carrier="SmartMobil hos"
+        apn="hos"
+        authtype="1"
+        mmsc=""
+        mmsport=""
+        mmsproxy=""
+        mvno_match_data=""
+        password=""
+        port=""
+        protocol="IPV4V6"
+        proxy=""
+        roaming_protocol="IPV4V6"
+        server=""
+        type="xcap"
+        user=""
+        user_editable="false"
+        user_visible="false"
+    />
+    <apn
+        mcc="262"
+        mnc="23"
+        carrier="SmartMobil internet"
+        apn="internet"
+        authtype="1"
+        mmsc=""
+        mmsport=""
+        mmsproxy=""
+        mvno_match_data=""
+        password=""
+        port=""
+        protocol="IPV4V6"
+        proxy=""
+        roaming_protocol="IPV4V6"
+        server=""
+        type="default"
+        user=""
+        user_editable="true"
+        user_visible="true"
+    />
     <apn
         mcc="262"
         mnc="42"
diff --git a/FR.xml b/FR.xml
index adb4d2a6a4d380a83e93c3e43fd66c98417a6f10..b3a03e941cf94ac36e3f821b15450e38af9cd23c 100644
--- a/FR.xml
+++ b/FR.xml
@@ -597,6 +597,27 @@
         type="default,supl"
         user="none"
     />
+    <apn
+        mcc="208"
+        mnc="10"
+        carrier="4G La Poste Mobile"
+        apn=""
+        mvno_match_data="4C"
+        mvno_type="gid"
+        type="ia"
+    />
+    <apn
+        mcc="208"
+        mnc="10"
+        carrier="4G La Poste Mobile"
+        apn="sl2sfr"
+        mmsc="http://mms1"
+        mmsport="8080"
+        mmsproxy="010.143.156.003"
+        mvno_match_data="4C"
+        mvno_type="gid"
+        type="default,supl,mms"
+    />
     <apn
         mcc="208"
         mnc="10"
@@ -758,13 +779,9 @@
         mmsc="http://mmsdebitel"
         mmsport="8080"
         mmsproxy="10.143.156.3"
-        mvno_match_data="La Poste Mobile"
-        mvno_type="spn"
-        password=""
-        port=""
-        proxy=""
+        mvno_match_data="4C"
+        mvno_type="gid"
         type="mms"
-        user=""
     />
     <apn
         mcc="208"
@@ -900,6 +917,15 @@
         type="default,supl"
         user=""
     />
+    <apn
+        mcc="208"
+        mnc="10"
+        carrier="SFR IMS"
+        apn="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        type="ims"
+    />
     <apn
         mcc="208"
         mnc="10"
@@ -1022,14 +1048,11 @@
         mnc="10"
         carrier="WEB La Poste Mobile"
         apn="wapdebitel"
-        mmsc=""
-        mvno_match_data="La Poste Mobile"
-        mvno_type="spn"
-        password=""
+        mvno_match_data="4C"
+        mvno_type="gid"
         port="8080"
         proxy="192.168.21.3"
         type="default,supl"
-        user=""
     />
     <apn
         mcc="208"
@@ -1052,27 +1075,6 @@
         apn="internetdebitel"
         type="default,supl"
     />
-    <apn
-        mcc="208"
-        mnc="10"
-        carrier="Web La Poste"
-        apn="wapdebitel"
-        port="8080"
-        proxy="192.168.21.3"
-        type="default,supl"
-    />
-    <apn
-        mcc="208"
-        mnc="10"
-        carrier="Web La Poste"
-        apn="wapdebitel"
-        mmsc=""
-        password=""
-        port="8080"
-        proxy="192.168.21.3"
-        type="default,supl"
-        user=""
-    />
     <apn
         mcc="208"
         mnc="10"
@@ -1189,6 +1191,14 @@
         type="mms"
         user=""
     />
+    <apn
+        mcc="208"
+        mnc="11"
+        carrier="SFR IMS"
+        apn="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+    />
     <apn
         mcc="208"
         mnc="13"
@@ -1215,6 +1225,15 @@
         type="mms"
         user=""
     />
+    <apn
+        mcc="208"
+        mnc="13"
+        carrier="SFR IMS"
+        apn="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        type="ims"
+    />
     <apn
         mcc="208"
         mnc="15"
@@ -1239,6 +1258,15 @@
         type="mms"
         user=""
     />
+    <apn
+        mcc="208"
+        mnc="15"
+        carrier="IMS"
+        apn="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        type="ims"
+    />
     <apn
         mcc="208"
         mnc="15"
@@ -1294,16 +1322,13 @@
         mnc="20"
         carrier="Bouygues Telecom"
         apn="mmsbouygtel.com"
+        authtype="1"
         mmsc="http://mms.bouyguestelecom.fr/mms/wapenc"
-        mmsport="8080"
-        mmsproxy="62.201.129.226"
         mvno_match_data="Bouygues Telecom"
         mvno_type="spn"
-        password=""
-        port=""
-        proxy=""
-        type="default,supl,mms"
-        user=""
+        protocol="IPV6"
+        roaming_protocol="IP"
+        type="default,dun,supl,mms"
     />
     <apn
         mcc="208"
diff --git a/NO.xml b/NO.xml
index 1e31d86b0aeaa9f1f6cb6c191624c187e08f1855..78f2fce02c3500b89b3fff7455d5560d51686214 100644
--- a/NO.xml
+++ b/NO.xml
@@ -98,18 +98,24 @@
     <apn
         mcc="242"
         mnc="05"
-        carrier="NwN Internet"
+        carrier="OneCall Internet"
         apn="internet"
+        authtype="1"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
         type="default,supl"
     />
     <apn
         mcc="242"
         mnc="05"
-        carrier="NwN MMS"
+        carrier="OneCall MMS"
         apn="mms"
-        mmsc="http://mms.nwn.no"
+        authtype="1"
+        mmsc="http://mmsc/"
         mmsport="80"
-        mmsproxy="188.149.250.10"
+        mmsproxy="10.100.100.100"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
         type="mms"
     />
     <apn
diff --git a/US.xml b/US.xml
index 45d9fe20b6b0a4bd833d2c3545bc707a6efb2891..7f857ae24a503b061bb4bbd52e7841b55b9f9261 100644
--- a/US.xml
+++ b/US.xml
@@ -876,6 +876,35 @@
         roaming_protocol="IPV4V6"
         type="default,supl,mms,ia"
     />
+    <apn
+        mcc="310"
+        mnc="240"
+        carrier="Murena Mobile"
+        apn="wholesale"
+        mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+        mmsport=""
+        mmsproxy=""
+        password=""
+        port=""
+        proxy=""
+        type="default,supl,mms,hipri,fota,cbs,xcap"
+        user=""
+    />
+    <apn
+        mcc="310"
+        mnc="240"
+        carrier="Tello"
+        apn="wholesale"
+        type="default,supl"
+    />
+    <apn
+        mcc="310"
+        mnc="240"
+        carrier="Tello MMS"
+        apn="service"
+        mmsc="http://wholesale.mmsmvno.com/mms/wapenc"
+        type="mms"
+    />
     <apn
         mcc="310"
         mnc="240"
diff --git a/apns-conf.xsd b/apns-conf.xsd
index 56636fce41420fa9182a9e06e0210f0253ec6676..28708001fc6c5104a7db1c96fc2b765c706f8c12 100644
--- a/apns-conf.xsd
+++ b/apns-conf.xsd
@@ -115,7 +115,7 @@
         <xs:attribute name="password" type="xs:string" />
         <xs:attribute name="proxy" type="xs:anyURI" />
         <xs:attribute name="port" type="xs:string" />
-        <xs:attribute name="mmsproxy" type="xs:anyURI" />
+        <xs:attribute name="mmsproxy" type="xs:string" />
         <xs:attribute name="mmsport" type="xs:string" />
         <xs:attribute name="mmsc" type="xs:anyURI" />
         <xs:attribute name="type" type="apnType" />