diff --git a/data/apple b/data/apple
index d415d5bb..2bef3c3f 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
@@ -39,6 +23,7 @@ apple.co.mz
 apple.co.nz
 apple.co.th
 apple.co.uk
+apple.com
 apple.com.af
 apple.com.au
 apple.com.bo
@@ -81,6 +66,7 @@ apple.in
 apple.is
 apple.it
 apple.jo
+apple.jp
 apple.kr
 apple.lk
 apple.lt
@@ -104,77 +90,17 @@ apple.si
 apple.sk
 apple.so
 apple.tt
+apple.tw
 apple.uk
+apple.xn--czr694b # apple.商标
+apple.xn--fiqs8s # apple.中国
 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
+apple-store.cn
+apple-store.wang
 applestore.bg
+applestore.cc
 applestore.ch
 applestore.cm
 applestore.cn
@@ -207,64 +133,27 @@ applestore.net.gr
 applestore.ph
 applestore.qa
 applestore.sg
+applestore.wang
+applestoreonline.com
 applestorepro.eu
-appletaiwan.com
-appletv.fr
-appleweb.net
-applexpo.net
-appmediagroup.com
+
+# App Store
+app-store.wang
+appe-store.com
+apple-appstore.cn
+appleappstore.cn
+appleappstore.net
+appleappstore.tv
 appsto.re
 appstore.co.id
 appstore.hk
 appstore.my
 appstore.ph
+appstoreapple.cn
 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
+tvappstore.net
+
+# iMac
 imac-apple.com
 imac-applecomputer.com
 imac.co
@@ -276,15 +165,15 @@ imac.one
 imac.rs
 imacapple.com
 imacapplecomputer.com
-imovie.eu
-imoviegallery.com
-imoviestage.com
+
+# iPad
+ebookforipad.com
+euroipad.com
 indiaipad.com
-insidemacintosh.com
-ipa-iphone.net
 ipad.co.kr
 ipad.de
 ipad.host
+ipad.wang
 ipad3.com
 ipadair.cl
 ipadair.cm
@@ -300,6 +189,27 @@ ipadmini.cm
 ipadmini.com.lk
 ipadmini.lk
 ipadpro.buzz
+ukipad.com
+
+# iPhone
+appleiphone.hu
+appleiphone.net
+bestiphonestuff.com
+dl-iphone.com
+hebiphone.com
+hf-iphone.com
+iphone-8.com.cn
+iphone-cd.com
+iphone-cn.com
+iphone-sh.com
+iphone-vip1.com
+iphone-vip2.com
+iphone-vip3.com
+iphone-vip4.com
+iphone-vip5.com
+iphone-x.tv
+iphone-yh.com
+iphone-zh.com
 iphone.cm
 iphone.com
 iphone.com.au
@@ -310,15 +220,23 @@ iphone.net.gr
 iphone.pt
 iphone.rs
 iphone.ru
+iphone.wang
 iphone4.com
 iphone4.com.br
+iphone4s.com
+iphone5s5case.com
 iphoneacessorios.com.br
 iphoneclaro.com.br
 iphonefc.com
 iphonegermany.com
-iphoto.eu
-iphoto.no
-iphoto.se
+iphonehangzhou.com
+iphoneplus.wang
+iphonese.tv
+iphoneunlockimei.com
+iphonexs.tv
+
+# iPod
+downloadsforipod.com
 ipod.ca
 ipod.ch
 ipod.cm
@@ -332,6 +250,7 @@ ipod.com.cn
 ipod.com.fr
 ipod.com.hk
 ipod.com.sg
+ipod.com.tw
 ipod.de
 ipod.es
 ipod.eu
@@ -347,25 +266,23 @@ ipod.tw
 ipodcentre.nl
 ipodcleaner.com
 ipodnano.com
+ipodnano.net
 ipodprices.com
 ipodrip.ca
 ipodrocks.com.au
 ipods.com
 ipodshop.com.au
 ipodtouch.co
-ischool.com
-itools.info
-iwork.se
-jetfuelapp.com
-jetfuelapps.com
-lojaiphone.com.br
-mac.com.au
-mac.eu
-mac.rs
-macappsto.re
+
+# MacBook
+imacsources.com
+launchpad.wang
+mac.wang
 macbook.co
 macbook.hk
 macbook.tw
+macbook.wang
+macbookair.cn
 macbookair.co.kr
 macbookair.co.uk
 macbookair.com
@@ -380,6 +297,90 @@ macbookpro.co
 macbookpro.com
 macbookpro.com.au
 macbookpro.us
+
+# Apple Watch
+apple-watch.com.ru
+applewatch.hk
+applewatch.tv
+applewatch.tw
+applewatch.wang
+applewatchedition.com
+applewatchseries3.net
+applewatchsport.com
+
+# Apple Music
+applemusic.berlin
+applemusic.com
+applemusic.com.au
+applemusic.hamburg
+applemusic.wang
+applemusicconnect.com
+applemusicfestival.com
+musickit.net
+
+# Apple News
+appleenews.com
+applenews.berlin
+applenews.hamburg
+applenews.tv
+applenewsformat.com
+
+# Apple Pay
+apple-pay.rs
+apple-pay.wang
+applepay.berlin
+applepay.co.rs
+applepay.com.tw
+applepay.hamburg
+applepay.hk
+applepay.info
+applepay.jp
+applepay.rs
+applepay.tv
+applepaycash.cn
+applepaycash.com.cn
+applepaycash.net
+applepaycash.tv
+applepaymerchantsupplies.info
+applepaysupplies.berlin
+applepaysupplies.cn
+applepaysupplies.com
+applepaysupplies.com.cn
+applepaysupplies.info
+applepaysupplies.net
+applepaysupplies.tv
+applewallet.com
+applewallet.tv
+
+# iBook
+ibook.co.nz
+ibook.eu
+ibookpartner.com
+
+# iPhoto
+iphoto.eu
+iphoto.no
+iphoto.se
+iphoto.wang
+
+# iMovie
+imovie.eu
+imoviegallery.com
+imoviestage.com
+
+# Apple Care
+applecare.berlin
+applecare.cc
+applecare.eu
+applecare.hamburg
+applecare.wang
+
+# macOS
+appledarwin.com
+appledarwin.net
+darwinsource.com
+darwinsource.org
+darwinsourcecode.com
 mach-os.com
 mach-os.net
 machos.net
@@ -387,36 +388,346 @@ macintosh.eu
 macintoshsoftware.com
 macos.com.au
 macosforge.org
+macossierra.com
 macosx.info
+
+# Apple ID
+appleaccount.net
+appleid-applemx.com
+appleid-applemx.us
+appleid-iclou.com
+appleid-uk.us
+appleid.berlin
+appleid.hamburg
+appleid.hk
+ids-apple.com
+
+# Beats
+albeats.com
+beatbydreuk2014.com
+beatfactoryoutlets.com
+beats-bydreoutletssale.net
+beats-seller.com
+beats1.cc
+beats1.cn
+beats1.tv
+beats1.com.cn
+beats2.com.cn
+beats4.cn
+beats4.net
+beats4salecheap.com
+beatsaudios.net
+beatsbeatsmonster.com
+beatsbydre-outlet.com
+beatsbydre-outletsale.net
+beatsbydre-us.com
+beatsbydrebeatsby.com
+beatsbydrecheaponlinesales.com
+beatsbydrediscount.com
+beatsbydreinexpensive.com
+beatsbydressolo.com
+beatsbydresstudio.com
+beatsbysdrbre.com
+beatsbysdrdres.com
+beatsdreinau.com
+beatsfactoryoutles.com
+beatsforme.com
+beatsep.cn
+beatsep.com
+beatsep.net
+beatsheadphones-discount.com
+beatsheadphones2u.com
+bestshoesale2014.net
+beatsmusic.wang
+beatsodre.com
+beatsone.net
+beatsoutletanytime.com
+beatssales.com
+beatssaleus.com
+bossae.com
+buyonlineheadphones.com
+cheapbagshoes.com
+cheapbeatsbydreonsale.com
+cheapbeatsbydreoutlet.com
+cheapheadphonessale.com
+cheapmonsterbeatsheadsets.com
+cheapmonsterbeatssale.com
+cnshopin.com
+cqcorea.com
+dkbeatsbydre.com
+drbeatsukmart.com
+drdrebeats-usa.com
+drdrebeatsale.com
+drdreheadphonekey.com
+drdreheadphonesusstore.com
+drebeats-solo.com
+drebeats-studio.com
+dreprobeats.com
+findmybeats.com
+gamebeforethegame.com
+headphones-dre.com
+headphonesbeatsbydre.com
+headphonesol.com
+hellokittybeats.com
+hipaa6020.com
+hotmonsterbeats.com
+hrsaz.com
+igoshopping.net
+lovemarca.com
+mbheadphone.com
+monster-beats-by-dr-dre.com
+monsterbeats-cheap.com
+monsterbeatsbydres.com
+monsterbeatsbydreshop.com
+monsterbeatshere.com
+ms4dre.com
+mybeatsbydrestudio.com
+namemybeats.com
+newbemany.com
+newdrediscount.com
+nflhotsalejerseys.com
+onsalekey.com
+outletbeatsshop.com
+paulsimon-music.com
+powerbeats2wireless.com
+sanvaras.com
+shoestop2.com
+shop-headphones.net
+sneakerpage.net
+straightouttasomewhere.com
+sunglassessale2014.com
+the-monster-beats.com
+thebeatsbydre.com
+thebeatsbydre.net
+unstyle.us
+wasdj.com
+yourmonsterbeats.com
+
+# Apple TV
+appletv.fr
+appletv.wang
+appletv4.cn
+appletv4.com.cn
+appletvapp.apple
+
+# Others
+1to1computing.com.au
+1to1conference.com.au
+5lml.com
+a0pple.net
+aapl.tw
+airport.brussels
+airport.eu
+airsupportapp.com
+airtunes.info
+alchemysynth.com
+ap0le.com
+appl4e.com
+apple-cloudkit.com
+apple-darwin.com
+apple-darwin.net
+apple-darwin.org
+apple-dns.cn
+apple-dns.com
+apple-dns.com.cn
+apple-dns.net
+apple-enews.com
+apple-expo.com
+apple-expo.eu
+apple-hk.com
+apple-ibooks.cn
+apple-inc.net
+apple-livephotoskit.com
+apple-maps.cn
+apple-usa.net
+appleaustralia.com
+appleaustralia.com.au
+appleaustralia.net.au
+applebk.net
+applecarbon.com
+applecard.tv
+applecare.wang
+applecentar.co.rs
+applecentar.rs
+applecenter.cn
+applecenter.com.cn
+applecentre.com.au
+applecentre.info
+appleclub.com.hk
+applecom.com
+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
+appledns.cn
+appledns.com.cn
+appleexpo.eu
+appleexpo.info
+applefilmaker.com
+applefilmmaker.com
+applefinalcutproworld.com
+applefinalcutproworld.net
+applefinalcutproworld.org
+applehongkong.com
+applehongkong.com.hk
+appleinclegal.com
+appleipodsettlement.com
+appleiservices.com
+applelink.com
+applemagickeyboard.com
+applemalaysia.com.my
+applemasters.info
+appleos.tv
+applepencil.net
+applepodcasts.com
+applepremiumreseller.com.au
+applepremiumresellers.com.au
+applereach.com
+applereach.net
+apples-msk.ru
+applescreensavers.com
+applescript.info
+appleshare.info
+appleshop.co.uk
+applesiri.cn
+appletaiwan.com
+appletips.net
+appleweb.net
+applexpo.net
+applezh.com
+applfe.com
+appmediagroup.com
+beddit.tv
+braeburncapital.com
+burstly.net
+burstlyrewards.com
+buyaapl.com
+buyaapl.net
+buyaple.com
+calendarserver.org
+camelphat.com
+camelspaceeffect.com
+carekit.org
+catalina.hk
+cdn-apple.com
+chomp.com
+coreml.net
+cups.org
+dashwood360.com
+desktopmovie.com
+desktopmovie.net
+desktopmovie.org
+desktopmovies.net
+desktopmovies.org
+developer-advisor.com
+device-manager.us
+digitalhub.com
+discussionsapple.com
+dot-mac.de
+dotmac.de
+dvdstudiopro.biz
+dvdstudiopro.com
+dvdstudiopro.info
+dvdstudiopro.net
+dvdstudiopro.org
+dvdstudiopro.us
+earpod.net
+ecgapp.com.cn
+ecgapp.net
+edu-research.org
+emac.co.in
+emac.in
+emagic.de
+faceid99.com
+faceid99.net
+faceidglobal.com
+faceshift.cn
+find-apple.com
+firewire.cl
+firewire.eu
+geoport.com
+homepod.cn
+hopstop.tv
+ichat.co.in
+idvd.eu
+ikids.com
+ilecture.co.nz
+ilife.eu
+ilife.gr
+ilife.wang
+imessage.tv
+insidear.cn
+insidemacintosh.com
+ipa-iphone.net
+ischool.com
+itools.info
+iwork.se
+iwork.wang
+jetfuelapp.com
+jetfuelapps.com
+latticedata.com
+livephotos.cn
+livephotos.com.cn
+livephotos.tv
+lojaiphone.com.br
+mac.com.au
+mac.eu
+mac.rs
+macappsto.re
 macreach.com
 macreach.net
+me.com
 mobileme.dk
+mr-apple.com.tw
+mzstatic.com
 powerbook.eu
+pullstring.net
+quatrowireless.com
 quicktime.com.au
 quicktime.eu
+reform-apple.com
+researchkit.cn
+researchkit.com.cn
+researchkit.hk
+researchkit.net
 researchkit.org
+researchkit.tv
+services-apple.net
+spektral.cc
+touchid.wang
+tracking-location.com
 truedepth3d.com
-ukipad.com
+tryrating.com
 webobjects.co.uk
 webobjects.de
 webobjects.eu
+wuxiapple.com
+wwapple.net
+www-sms-apple.com
+wwwapple.net
+wwwlapple.com
+xn--fiqs8sxootzz.xn--hxt814e # 苹果中国.网店
+xn--gtvq61aiijy0b.xn--hxt814e # 苹果电脑.网店
+xn--gtvz22d.wang # 苹果.wang
+xn--gtvz22d.xn--hxt814e # 苹果.网店
+xn--hxtr4rozx.xn--czr694b # 苹果店.商标
+xn--kput3imi374g.xn--hxt814e # 苹果手机.网店
+xn--ruq8a011kt6y.xn--hxt814e # 苹果保修.网店
 
-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