diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index aefd32d..3d9694d 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -367,11 +367,21 @@
      mvno_type="imsi"
   />
 
+  <apn carrier="Jump Roam"
+      mcc="204"
+      mnc="04"
+      apn="mobiledata"
+      authtype="0"
+      mvno_type="spn"
+      mvno_match_data="Jump"
+  />
+
   <apn carrier="Truphone"
       mcc="204"
       mnc="04"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
       mvno_match_data="204043914"
       mvno_type="imsi"
   />
@@ -380,7 +390,8 @@
       mcc="204"
       mnc="04"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
       mvno_match_data="20404794"
       mvno_type="imsi"
   />
@@ -965,6 +976,29 @@
       type="default,supl"
   />
 
+  <apn carrier="netgprs.com"
+      mcc="206"
+      mnc="10"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="BE-Transatel"
+      mvno_type="spn"
+   />
+
+
+ <apn carrier="netgprs.com"
+      mcc="206"
+      mnc="10"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="BB00"
+      mvno_type="gid"
+  />
+
   <apn carrier="BASE WAP"
       mcc="206"
       mnc="20"
@@ -1170,6 +1204,16 @@
       type="dun"
   />
 
+  <apn carrier="Truphone"
+       mcc="208"
+       mnc="09"
+       apn="truphone.com"
+       mmsc="http://mmsc.truphone.com:1981/mm1"
+       type="default,supl,mms,dun"
+       mvno_match_data="208090022"
+       mvno_type="imsi"
+  />
+
   <apn carrier="SFR webphone"
       mcc="208"
       mnc="10"
@@ -1522,6 +1566,17 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="netgprs.com"
+      mcc="208"
+      mnc="22"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="FR-Transatel"
+      mvno_type="spn"
+  />
+
   <apn carrier="Virgin mobile"
       mcc="208"
       mnc="23"
@@ -2130,7 +2185,8 @@
       mcc="214"
       mnc="27"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
   />
 
   <apn carrier="Tuenti"
@@ -3106,6 +3162,28 @@
       type="mms"
   />
 
+  <apn carrier="netgprs.com"
+      mcc="228"
+      mnc="03"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="CH-Transatel"
+      mvno_type="spn"
+   />
+
+   <apn carrier="netgprs.com"
+      mcc="228"
+      mnc="03"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="BB00"
+      mvno_type="gid"
+  />
+
   <apn carrier="T-Mobile CZ"
       mcc="230"
       mnc="01"
@@ -3529,6 +3607,15 @@
       mvno_match_data="giffgaff"
   />
 
+  <apn carrier="Jump UK"
+      mcc="234"
+      mnc="10"
+      apn="mobiledata"
+      authtype="0"
+      mvno_type="spn"
+      mvno_match_data="Jump"
+  />
+
   <apn carrier="O2 MOBILE WEB"
       mcc="234"
       mnc="11"
@@ -4010,7 +4097,8 @@
       mcc="234"
       mnc="25"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
   />
 
   <apn carrier="Jersey Telecom"
@@ -5563,6 +5651,13 @@
       type="mms"
   />
 
+  <apn carrier="VODA internet"
+      mcc="250"
+      mnc="28"
+      apn="vodalte.ru"
+      type="default,supl"
+  />
+
   <apn carrier="Beeline Internet"
       mcc="250"
       mnc="99"
@@ -5935,7 +6030,18 @@
       mcc="260"
       mnc="33"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
+  />
+
+  <apn carrier="Rebtel"
+      mcc="260"
+      mnc="44"
+      apn="rebtel"
+      mmsc="http://mmsc.rebtel.com"
+      mmsproxy="185.114.248.80"
+      mmsport="8080"
+      type="default,supl,mms"
   />
 
   <apn carrier="Telekom Internet"
@@ -6124,7 +6230,8 @@
       mcc="262"
       mnc="42"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
   />
 
   <apn carrier="Vodafone Net2"
@@ -6252,6 +6359,28 @@
       type="mms"
   />
 
+   <apn carrier="netgprs.com"
+      mcc="270"
+      mnc="77"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="BB00"
+      mvno_type="gid"
+  />
+
+  <apn carrier="netgprs.com"
+      mcc="270"
+      mnc="77"
+      apn="netgprs.com"
+      user="tsl"
+      password="tsl"
+      type="default,supl"
+      mvno_match_data="LU-Transatel"
+      mvno_type="spn"
+  />
+
   <apn carrier="Orange"
       mcc="270"
       mnc="99"
@@ -8213,7 +8342,7 @@
       mnc="004"
       apn="internet"
       authtype="3"
-      type="default,mms,supl,fota,ims,cbs"
+      type="default,mms,supl,fota,cbs"
       mmsc="http://mms.vtext.com/servlets/mms"
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"
@@ -8224,7 +8353,7 @@
       mnc="004"
       apn="internet"
       authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
+      type="default,mms,supl,fota,cbs,dun"
       mmsc="http://mms.vtext.com/servlets/mms"
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"
@@ -9699,7 +9828,8 @@
       mcc="310"
       mnc="30"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
   />
 
 
@@ -9707,7 +9837,8 @@
       mcc="310"
       mnc="300"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
   />
 
   <apn carrier="T-Mobile US 310"
@@ -13826,7 +13957,7 @@
       mnc="480"
       apn="internet"
       authtype="3"
-      type="default,mms,supl,fota,ims,cbs"
+      type="default,mms,supl,fota,cbs"
       mmsc="http://mms.vtext.com/servlets/mms"
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"
@@ -13838,7 +13969,7 @@
       mnc="480"
       apn="internet"
       authtype="3"
-      type="default,mms,supl,fota,ims,cbs,dun"
+      type="default,mms,supl,fota,cbs,dun"
       mmsc="http://mms.vtext.com/servlets/mms"
       protocol="IPV4V6"
       bearer_bitmask="4|5|6|7|8|12"
@@ -14919,6 +15050,28 @@
       roaming_protocol="IP"
   />
 
+  <apn carrier="Cleartalk"
+      mcc="311"
+      mnc="750"
+      apn="CdmaNai"
+      authtype="3"
+      type="default,mms,supl,dun"
+      mmsc="http://mms.cleartalk.us/cleartalk/mms.php"
+      protocol="IPV4V6"
+      bearer_bitmask="6"
+  />
+  <apn carrier="ClearTalk LTE"
+      mcc="311"
+      mnc="750"
+      apn="home.netamerica.com"
+      type="default,mms,supl,dun"
+      bearer_bitmask="14"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mmsc="http://mms.cleartalk.us/cleartalk/mms.php"
+      mtu="1428"
+    />
+
   <apn carrier="MobileNation"
       mcc="311"
       mnc="910"
@@ -25459,7 +25612,8 @@
       mcc="454"
       mnc="08"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
   />
 
   <apn carrier="one2free"
@@ -26423,7 +26577,8 @@
       mcc="505"
       mnc="02"
       apn="truphone.com"
-      type="default,supl"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
       mvno_match_data="50502100"
       mvno_type="imsi"
   />
@@ -26521,6 +26676,14 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Truphone"
+      mcc="505"
+      mnc="38"
+      apn="truphone.com"
+      mmsc="http://mmsc.truphone.com:1981/mm1"
+      type="default,supl,mms,dun"
+  />
+
   <apn carrier="Telstra MMS"
       mcc="505"
       mnc="71"
diff --git a/products/product_launched_with_l.mk b/products/product_launched_with_l.mk
new file mode 100644
index 0000000..2911993
--- /dev/null
+++ b/products/product_launched_with_l.mk
@@ -0,0 +1,3 @@
+#ro.product.first_api_level indicates the first api level, device has been commercially launced on.
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.product.first_api_level=21
diff --git a/products/product_launched_with_l_mr1.mk b/products/product_launched_with_l_mr1.mk
new file mode 100644
index 0000000..10d629f
--- /dev/null
+++ b/products/product_launched_with_l_mr1.mk
@@ -0,0 +1,3 @@
+#ro.product.first_api_level indicates the first api level, device has been commercially launced on.
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.product.first_api_level=22
diff --git a/products/product_launched_with_m.mk b/products/product_launched_with_m.mk
new file mode 100644
index 0000000..d82a255
--- /dev/null
+++ b/products/product_launched_with_m.mk
@@ -0,0 +1,3 @@
+#ro.product.first_api_level indicates the first api level, device has been commercially launced on.
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.product.first_api_level=23
diff --git a/products/product_launched_with_n.mk b/products/product_launched_with_n.mk
new file mode 100644
index 0000000..72f34d8
--- /dev/null
+++ b/products/product_launched_with_n.mk
@@ -0,0 +1,3 @@
+#ro.product.first_api_level indicates the first api level, device has been commercially launced on.
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.product.first_api_level=24