diff --git a/data/apple b/data/apple
index d415d5bb..401f6cdd 100644
--- a/data/apple
+++ b/data/apple
@@ -1,26 +1,10 @@
+include:icloud
+include:itunes
+include:swift
+
 # All .apple domains
 apple
 
-apple.com
-apple.net
-
-1to1computing.com.au
-1to1conference.com.au
-airport.brussels
-airport.eu
-airsupportapp.com
-airtunes.info
-alchemysynth.com
-apple-darwin.com
-apple-darwin.net
-apple-darwin.org
-apple-enews.com
-apple-expo.com
-apple-expo.eu
-apple-hk.com
-apple-inc.net
-apple-pay.rs
-apple-watch.com.ru
 apple.ae
 apple.at
 apple.be
@@ -30,7 +14,6 @@ apple.ca
 apple.ch
 apple.cl
 apple.cm
-apple.cn
 apple.co.cr
 apple.co.hu
 apple.co.jp
@@ -39,11 +22,11 @@ apple.co.mz
 apple.co.nz
 apple.co.th
 apple.co.uk
+apple.com
 apple.com.af
 apple.com.au
 apple.com.bo
 apple.com.br
-apple.com.cn
 apple.com.co
 apple.com.de
 apple.com.do
@@ -106,85 +89,17 @@ apple.so
 apple.tt
 apple.uk
 apple.xyz
-appleaustralia.com
-appleaustralia.com.au
-appleaustralia.net.au
-applecarbon.com
-applecare.berlin
-applecare.cc
-applecare.eu
-applecare.hamburg
-applecentar.co.rs
-applecentar.rs
-applecentre.com.au
-applecentre.info
-appleclub.com.hk
-applecomputer-imac.com
-applecomputer.cn
-applecomputer.co.in
-applecomputer.co.nz
-applecomputer.com.cn
-applecomputer.com.hk
-applecomputer.com.tw
-applecomputer.hu
-applecomputer.kr
-applecomputerimac.com
-applecomputerinc.info
-applecomputers.co.nz
-appledarwin.com
-appledarwin.net
-appleenews.com
-appleexpo.eu
-appleexpo.info
-applefilmaker.com
-applefilmmaker.com
-applefinalcutproworld.com
-applefinalcutproworld.net
-applefinalcutproworld.org
-applehongkong.com
-applehongkong.com.hk
-appleid.berlin
-appleid.hamburg
-appleiphone.hu
-appleipodsettlement.com
-appleiservices.com
-applemalaysia.com.my
-applemasters.info
-applemusic.berlin
-applemusic.com
-applemusic.com.au
-applemusic.hamburg
-applemusicfestival.com
-applenews.berlin
-applenews.hamburg
-applepay.berlin
-applepay.co.rs
-applepay.hamburg
-applepay.info
-applepay.rs
-applepaymerchantsupplies.info
-applepaysupplies.berlin
-applepaysupplies.info
-applepodcasts.com
-applepremiumreseller.com.au
-applepremiumresellers.com.au
-applereach.com
-applereach.net
-apples-msk.ru
-applescript.info
-appleshare.info
-appleshop.co.uk
+
+# Apple Store
 applestore.bg
 applestore.ch
 applestore.cm
-applestore.cn
 applestore.co.hu
 applestore.co.jp
 applestore.co.ug
 applestore.co.uk
 applestore.com.au
 applestore.com.bn
-applestore.com.cn
 applestore.com.ee
 applestore.com.eg
 applestore.com.gr
@@ -208,63 +123,16 @@ applestore.ph
 applestore.qa
 applestore.sg
 applestorepro.eu
-appletaiwan.com
-appletv.fr
-appleweb.net
-applexpo.net
-appmediagroup.com
+
+# App Store
 appsto.re
 appstore.co.id
 appstore.hk
 appstore.my
 appstore.ph
 asto.re
-braeburncapital.com
-burstly.net
-burstlyrewards.com
-buyaapl.com
-buyaapl.net
-buyaple.com
-calendarserver.org
-camelphat.com
-camelspaceeffect.com
-carekit.org
-chomp.com
-darwinsource.com
-darwinsource.org
-darwinsourcecode.com
-desktopmovie.com
-desktopmovie.net
-desktopmovie.org
-desktopmovies.net
-desktopmovies.org
-digitalhub.com
-dot-mac.de
-dotmac.de
-dvdstudiopro.biz
-dvdstudiopro.com
-dvdstudiopro.info
-dvdstudiopro.net
-dvdstudiopro.org
-dvdstudiopro.us
-earpod.net
-edu-research.org
-emac.in
-emac.co.in
-emagic.de
-euroipad.com
-firewire.cl
-firewire.eu
-geoport.com
-ibook.co.nz
-ibook.eu
-ibookpartner.com
-ichat.co.in
-idvd.eu
-ikids.com
-ilecture.co.nz
-ilife.eu
-ilife.gr
+
+# iMac
 imac-apple.com
 imac-applecomputer.com
 imac.co
@@ -276,12 +144,10 @@ imac.one
 imac.rs
 imacapple.com
 imacapplecomputer.com
-imovie.eu
-imoviegallery.com
-imoviestage.com
+
+# iPad
+euroipad.com
 indiaipad.com
-insidemacintosh.com
-ipa-iphone.net
 ipad.co.kr
 ipad.de
 ipad.host
@@ -300,6 +166,10 @@ ipadmini.cm
 ipadmini.com.lk
 ipadmini.lk
 ipadpro.buzz
+ukipad.com
+
+# iPhone
+appleiphone.hu
 iphone.cm
 iphone.com
 iphone.com.au
@@ -312,13 +182,13 @@ iphone.rs
 iphone.ru
 iphone4.com
 iphone4.com.br
+iphone4s.com
 iphoneacessorios.com.br
 iphoneclaro.com.br
 iphonefc.com
 iphonegermany.com
-iphoto.eu
-iphoto.no
-iphoto.se
+
+# iPod
 ipod.ca
 ipod.ch
 ipod.cm
@@ -328,7 +198,6 @@ ipod.co.uk
 ipod.co.za
 ipod.com
 ipod.com.au
-ipod.com.cn
 ipod.com.fr
 ipod.com.hk
 ipod.com.sg
@@ -353,6 +222,185 @@ ipodrocks.com.au
 ipods.com
 ipodshop.com.au
 ipodtouch.co
+
+# MacBook
+macbook.co
+macbook.hk
+macbook.tw
+macbookair.co.kr
+macbookair.co.uk
+macbookair.com
+macbookair.com.au
+macbookair.com.es
+macbookair.es
+macbookair.hk
+macbookair.kr
+macbookair.jp
+macbookpro.co
+macbookpro.com
+macbookpro.com.au
+macbookpro.us
+
+# Apple Music
+applemusic.berlin
+applemusic.com
+applemusic.com.au
+applemusic.hamburg
+applemusicfestival.com
+
+# Apple News
+appleenews.com
+applenews.berlin
+applenews.hamburg
+
+# Apple Pay
+apple-pay.rs
+applepay.berlin
+applepay.co.rs
+applepay.hamburg
+applepay.info
+applepay.rs
+applepaymerchantsupplies.info
+applepaysupplies.berlin
+applepaysupplies.info
+
+# iBook
+ibook.co.nz
+ibook.eu
+ibookpartner.com
+
+# iPhoto
+iphoto.eu
+iphoto.no
+iphoto.se
+
+# iMovie
+imovie.eu
+imoviegallery.com
+imoviestage.com
+
+# Apple Care
+applecare.berlin
+applecare.cc
+applecare.eu
+applecare.hamburg
+
+# Others
+1to1computing.com.au
+1to1conference.com.au
+airport.brussels
+airport.eu
+airsupportapp.com
+airtunes.info
+alchemysynth.com
+apple-cloudkit.com
+apple-darwin.com
+apple-darwin.net
+apple-darwin.org
+apple-dns.net
+apple-enews.com
+apple-expo.com
+apple-expo.eu
+apple-hk.com
+apple-inc.net
+apple-watch.com.ru
+appleaustralia.com
+appleaustralia.com.au
+appleaustralia.net.au
+applecarbon.com
+applecentar.co.rs
+applecentar.rs
+applecentre.com.au
+applecentre.info
+appleclub.com.hk
+applecom.com
+applecomputer-imac.com
+applecomputer.co.in
+applecomputer.co.nz
+applecomputer.com.hk
+applecomputer.com.tw
+applecomputer.hu
+applecomputer.kr
+applecomputerimac.com
+applecomputerinc.info
+applecomputers.co.nz
+appledarwin.com
+appledarwin.net
+appleexpo.eu
+appleexpo.info
+applefilmaker.com
+applefilmmaker.com
+applefinalcutproworld.com
+applefinalcutproworld.net
+applefinalcutproworld.org
+applehongkong.com
+applehongkong.com.hk
+appleid.berlin
+appleid.hamburg
+appleipodsettlement.com
+appleiservices.com
+applemalaysia.com.my
+applemasters.info
+applepodcasts.com
+applepremiumreseller.com.au
+applepremiumresellers.com.au
+applereach.com
+applereach.net
+apples-msk.ru
+applescript.info
+appleshare.info
+appleshop.co.uk
+appletaiwan.com
+appletv.fr
+appleweb.net
+applexpo.net
+appmediagroup.com
+braeburncapital.com
+burstly.net
+burstlyrewards.com
+buyaapl.com
+buyaapl.net
+buyaple.com
+calendarserver.org
+camelphat.com
+camelspaceeffect.com
+carekit.org
+cdn-apple.com
+chomp.com
+cups.org
+darwinsource.com
+darwinsource.org
+darwinsourcecode.com
+desktopmovie.com
+desktopmovie.net
+desktopmovie.org
+desktopmovies.net
+desktopmovies.org
+digitalhub.com
+dot-mac.de
+dotmac.de
+dvdstudiopro.biz
+dvdstudiopro.com
+dvdstudiopro.info
+dvdstudiopro.net
+dvdstudiopro.org
+dvdstudiopro.us
+earpod.net
+edu-research.org
+emac.co.in
+emac.in
+emagic.de
+firewire.cl
+firewire.eu
+geoport.com
+ichat.co.in
+idvd.eu
+ikids.com
+ilecture.co.nz
+ilife.eu
+ilife.gr
+insidemacintosh.com
+ipa-iphone.net
 ischool.com
 itools.info
 iwork.se
@@ -363,23 +411,6 @@ mac.com.au
 mac.eu
 mac.rs
 macappsto.re
-macbook.co
-macbook.hk
-macbook.tw
-macbookair.co.kr
-macbookair.co.uk
-macbookair.com
-macbookair.com.au
-macbookair.com.cn
-macbookair.com.es
-macbookair.es
-macbookair.hk
-macbookair.kr
-macbookair.jp
-macbookpro.co
-macbookpro.com
-macbookpro.com.au
-macbookpro.us
 mach-os.com
 mach-os.net
 machos.net
@@ -391,32 +422,22 @@ macosx.info
 macreach.com
 macreach.net
 mobileme.dk
+mzstatic.com
 powerbook.eu
 quicktime.com.au
 quicktime.eu
 researchkit.org
 truedepth3d.com
-ukipad.com
 webobjects.co.uk
 webobjects.de
 webobjects.eu
 
-applecom.com
-iphone4s.com
+full:apple.com.akadns.net
+full:courier-push-apple.com.akadns.net
+full:push-apple.com.akadns.net
 
-apple-cloudkit.com
-cdn-apple.com
-mzstatic.com
-
-apple.com.akadns.net
-courier-push-apple.com.akadns.net
-push-apple.com.akadns.net
-
-apple-dns.cn
-apple-dns.net
-
-cups.org
-
-include:icloud
-include:itunes
-include:swift
+# For developers
+developer.apple.com @dev
+devimages-cdn.apple.com @dev
+devstreaming-cdn.apple.com @dev
+playgrounds-cdn.apple.com @dev
diff --git a/data/icloud b/data/icloud
index eeca24eb..77a20859 100644
--- a/data/icloud
+++ b/data/icloud
@@ -1,7 +1,6 @@
 icloud-content.com
 icloud.ch
 icloud.com
-icloud.com.cn
 icloud.de
 icloud.ee
 icloud.fi
diff --git a/data/itunes b/data/itunes
index cf850443..9a756168 100644
--- a/data/itunes
+++ b/data/itunes
@@ -30,4 +30,4 @@ itunesradio.rio
 itunesstore.co
 itunesu.com
 
-itunes-apple.com.akadns.net
+full:itunes-apple.com.akadns.net