diff --git a/data/baidu b/data/baidu
index 703b60d3..bbc653bd 100644
--- a/data/baidu
+++ b/data/baidu
@@ -1,5 +1,7 @@
-# All .baidu domains
+include:baidu-ads
+include:zuoyebang
 
+# All .baidu domains
 baidu
 
 91.com
@@ -14,6 +16,7 @@ baidupcs.com
 baidustatic.com
 baifae.com
 baifubao.com
+bcebos.com
 bdimg.com
 bdstatic.com
 bdtjrcv.com
@@ -38,6 +41,3 @@ tieba.com
 tiebaimg.com
 xianfae.com
 xiaodutv.com
-
-include:baidu-ads
-include:zuoyebang
diff --git a/data/cheetahmobile b/data/cheetahmobile
new file mode 100644
index 00000000..768425d0
--- /dev/null
+++ b/data/cheetahmobile
@@ -0,0 +1,8 @@
+cmcm.com
+cmcmcdn.com
+liebao.cn
+
+# Antivirus
+duba.com
+duba.net
+ijinshan.com
diff --git a/data/geolocation-cn b/data/geolocation-cn
index 3a563ff3..9a2b248b 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -1,116 +1,147 @@
 # List of all domains that have access point in China
 
-include:4399
-include:51job
-include:58tongcheng
-include:acfun
-include:acplay
-include:alibaba
-include:baidu
-include:bilibili
-include:bytedance
-include:cas
-include:category-bank-cn
-include:category-collaborate-cn
-include:category-hospital-cn
-include:category-mooc-cn
-include:category-scholar-cn
-include:category-wiki-cn
-include:cctv
-include:chinamobile
-include:chinatelecom
-include:chinaunicom
-include:coding
-include:coolapk
-include:cowtransfer
-include:csdn
-include:ctrip
-include:dedao
-include:douyu
-include:eleme
-include:erji
-include:everbright
-include:ganji
-include:gcores
-include:gitv
-include:huawei
-include:hupu
-include:huya
-include:ifanr
-include:iqiyi
-include:jd
-include:jiemian
+# Advertisment & Analytics
 include:jiguang
-include:jinrishici
-include:jinshuju
-include:keep
-include:kuaishou
-include:lagou
-include:landian
-include:lanzou
-include:liepin
-include:mafengwo
-include:manmanbuy
-include:meitu
-include:meituan
-include:meizu
-include:mihoyo
-include:netease
-include:nga
-include:oneplus
-include:oppo
-include:pinduoduo
-include:pptv
-include:qihoo360
-include:qiniu
-include:ruanmei
-include:sf-express
-include:sfacg
-include:sina
-include:sinopec
-include:sogou
-include:stage1st
-include:suning
-include:taikang
-include:taomee
-include:taptap
-include:tencent
-include:tiancity
-include:tipdm
-include:tmtpost
-include:tongcheng
 include:umeng
-include:wanfang
-include:wjx
-include:xiaomi
-include:ximalaya
-include:xueersi
-include:xueqiu
-include:xunlei
-include:ynet
-include:youku
-include:youzan
-include:yuanfudao
-include:yunfanjiasu
-include:zhihu
-include:zhihuishu
-include:ziroom
 
-# CDNs
-## 金山云
-ksyun.com
-ksyungslb.com
+# CDN companies & Services
+include:qiniu
+include:staticfile
+include:yunfanjiasu
+
+## AMP
+full:cdn.ampproject.org
 
 ## jsDelivr
-cdn.jsdelivr.net
+full:cdn.jsdelivr.net
+
+## Google
+recaptcha.net
+full:fonts.googleapis.com
+full:fonts.gstatic.com
+full:safebrowsing.googleapis.com
 
 ## 网宿科技
 ourdvsss.com
 
+# Bank & Finance & Insurance
+include:category-bank-cn
+include:everbright
+include:taikang
+include:xueqiu
 
-# Moji Weather
-moji.com
-mojichina.com
+# E-commerce
+include:58tongcheng
+include:ctrip
+include:eleme
+include:ganji
+include:jd
+include:manmanbuy
+include:meituan
+include:pinduoduo
+include:suning
+include:tongcheng
+include:youzan
+include:ziroom
+
+# Entertainment & Videos & Games & Music & Podcasts
+include:4399
+include:acfun
+include:acplay
+include:bilibili
+include:dedao
+include:douyu
+include:gcores
+include:gitv
+include:huya
+include:iqiyi
+include:kuaishou
+include:mihoyo
+include:pptv
+include:sfacg
+include:taomee
+include:taptap
+include:tiancity
+include:ximalaya
+include:youku
+
+# Forums
+include:erji
+include:nga
+include:stage1st
+include:zhihu
+
+# Logistics
+include:sf-express
+
+# News & Press & Media
+include:hupu
+include:ifanr
+include:cctv
+include:jiemian
+include:landian
+include:ruanmei
+include:tmtpost
+include:ynet
+
+# Others
+include:sinopec
+
+# Organizations
+include:cas
+include:category-hospital-cn
+
+# Services & Softwares
+include:51job
+include:category-collaborate-cn
+include:coolapk
+include:cowtransfer
+include:keep
+include:jinshuju
+include:lagou
+include:lanzou
+include:liepin
+include:mafengwo
+include:meitu
+include:moji
+include:wjx
+
+# Science & Technology & Knowledge & Scholar & Press & E-learning
+include:category-mooc-cn
+include:category-scholar-cn
+include:category-wiki-cn
+include:wanfang
+include:xueersi
+include:yuanfudao
+include:zhihuishu
+
+# Software development related
+include:coding
+include:csdn
+include:jinrishici
+include:tipdm
+
+# Tech companies & Orginations
+include:bytedance
+include:alibaba
+include:baidu
+include:huawei
+include:kingsoft
+include:meizu
+include:netease
+include:oppo
+include:oneplus
+include:qihoo360
+include:sina
+include:sogou
+include:tencent
+include:xiaomi
+include:xunlei
+
+# Telecommunication
+include:chinamobile
+include:chinatelecom
+include:chinaunicom
 
 # 在线工具书
 guoxuedashi.com
@@ -1014,7 +1045,6 @@ sspai.com
 ssports.com
 starbaby.cc
 starbaby.com
-staticfile.org
 stockstar.com
 sun0769.com
 sunrtb.com
diff --git a/data/kingsoft b/data/kingsoft
new file mode 100644
index 00000000..398549b6
--- /dev/null
+++ b/data/kingsoft
@@ -0,0 +1,12 @@
+include:cheetahmobile
+include:seasun
+include:wps
+
+kimg.cn
+kingsoft.com
+ksmobile.com
+
+# Kingsoft Cloud
+ks-cdn.com
+ksyun.com
+ksyungslb.com
diff --git a/data/moji b/data/moji
new file mode 100644
index 00000000..5876e24c
--- /dev/null
+++ b/data/moji
@@ -0,0 +1,2 @@
+moji.com
+mojichina.com
diff --git a/data/seasun b/data/seasun
new file mode 100644
index 00000000..cb2e6bae
--- /dev/null
+++ b/data/seasun
@@ -0,0 +1,6 @@
+seasungames.com
+xishanju.com
+xoyo.com
+
+# Testplus
+testplus.cn
diff --git a/data/staticfile b/data/staticfile
new file mode 100644
index 00000000..613fff01
--- /dev/null
+++ b/data/staticfile
@@ -0,0 +1 @@
+staticfile.org
diff --git a/data/wps b/data/wps
new file mode 100644
index 00000000..7fe7a4bb
--- /dev/null
+++ b/data/wps
@@ -0,0 +1,19 @@
+wps.cn
+
+# Dazitong
+51dzt.com
+
+# Dictionary
+iciba.com
+
+# Docer
+docer.com
+
+# Documents
+kdocs.cn
+
+# PAPocket
+papocket.com
+
+# PDF
+wpspdf.cn