diff --git a/lib/domains/abused.txt b/lib/domains/abused.txt
index 4e0e4ca205..a1f10b476a 100644
--- a/lib/domains/abused.txt
+++ b/lib/domains/abused.txt
@@ -66,7 +66,6 @@ mohawkcollege.ca
 my.centennialcollege.ca
 share.epsb.ca
 slc.ubc.ca
-student.concordia.ab.ca
 unb.ca
 uregina.ca
 workschool.ca
@@ -1419,4 +1418,8 @@ educacionbogota.edu.co
 deltauniv.edu.eg
 ulht.pt
 dgu.ac.kr
-cefet-rj.br
\ No newline at end of file
+cefet-rj.br
+poltera.ac.id
+gujgov.edu.in
+pomona.edu
+nur.edu.bo
\ No newline at end of file
diff --git a/lib/domains/ar/edu/21.txt b/lib/domains/ar/edu/21.txt
new file mode 100644
index 0000000000..39e0c011e7
--- /dev/null
+++ b/lib/domains/ar/edu/21.txt
@@ -0,0 +1 @@
+Universidad Empresarial Siglo 21
diff --git a/lib/domains/au/edu/wa/eccs.txt b/lib/domains/au/edu/wa/eccs.txt
new file mode 100644
index 0000000000..ccf5afcf32
--- /dev/null
+++ b/lib/domains/au/edu/wa/eccs.txt
@@ -0,0 +1 @@
+ Emmanuel Christian Community School
\ No newline at end of file
diff --git a/lib/domains/br/fmu.txt b/lib/domains/br/fmu.txt
index 9df860d9b2..c365758eb8 100644
--- a/lib/domains/br/fmu.txt
+++ b/lib/domains/br/fmu.txt
@@ -1,2 +1 @@
-Centro Universitário FMU
-FMU University Center
\ No newline at end of file
+Faculdade Metropolitanas Unidas
diff --git a/lib/domains/ca/ab/concordia/student.txt b/lib/domains/ca/ab/concordia/student.txt
new file mode 100644
index 0000000000..508a08e165
--- /dev/null
+++ b/lib/domains/ca/ab/concordia/student.txt
@@ -0,0 +1 @@
+Concordia University of Edmonton
\ No newline at end of file
diff --git a/lib/domains/ch/iscs-zug.txt b/lib/domains/ch/iscs-zug.txt
new file mode 100644
index 0000000000..3095bc0953
--- /dev/null
+++ b/lib/domains/ch/iscs-zug.txt
@@ -0,0 +1 @@
+International School of Central Switzerland
\ No newline at end of file
diff --git a/lib/domains/com/colegioanamariamatute.txt b/lib/domains/com/colegioanamariamatute.txt
new file mode 100644
index 0000000000..26e3d010a9
--- /dev/null
+++ b/lib/domains/com/colegioanamariamatute.txt
@@ -0,0 +1 @@
+Ana María Matute
\ No newline at end of file
diff --git a/lib/domains/com/southfieldsacademy.txt b/lib/domains/com/southfieldsacademy.txt
new file mode 100644
index 0000000000..e0eb7634e9
--- /dev/null
+++ b/lib/domains/com/southfieldsacademy.txt
@@ -0,0 +1 @@
+Southfields Academy
\ No newline at end of file
diff --git a/lib/domains/de/bildung-lsa/gym-siemens.txt b/lib/domains/de/bildung-lsa/gym-siemens.txt
new file mode 100644
index 0000000000..ce0b4ba882
--- /dev/null
+++ b/lib/domains/de/bildung-lsa/gym-siemens.txt
@@ -0,0 +1 @@
+Werner-von-Siemens Gymnasium Magdeburg
\ No newline at end of file
diff --git a/lib/domains/dk/mpi.txt b/lib/domains/dk/mpi.txt
deleted file mode 100644
index bcea94fbc9..0000000000
--- a/lib/domains/dk/mpi.txt
+++ /dev/null
@@ -1 +0,0 @@
-Montagu Polytechnic Institute
\ No newline at end of file
diff --git a/lib/domains/edu/coloradomesa.txt b/lib/domains/edu/coloradomesa.txt
new file mode 100644
index 0000000000..be2114fc34
--- /dev/null
+++ b/lib/domains/edu/coloradomesa.txt
@@ -0,0 +1 @@
+Colorado Mesa University
\ No newline at end of file
diff --git a/lib/domains/edu/cwi.txt b/lib/domains/edu/cwi.txt
new file mode 100644
index 0000000000..bc323f18f4
--- /dev/null
+++ b/lib/domains/edu/cwi.txt
@@ -0,0 +1 @@
+College of Western Idaho
\ No newline at end of file
diff --git a/lib/domains/edu/eac/monsters.txt b/lib/domains/edu/eac/monsters.txt
new file mode 100644
index 0000000000..1d2b9deabe
--- /dev/null
+++ b/lib/domains/edu/eac/monsters.txt
@@ -0,0 +1 @@
+Eastern Arizona College
\ No newline at end of file
diff --git a/lib/domains/edu/essex/email.txt b/lib/domains/edu/essex/email.txt
new file mode 100644
index 0000000000..741847b11f
--- /dev/null
+++ b/lib/domains/edu/essex/email.txt
@@ -0,0 +1 @@
+Essex County College
\ No newline at end of file
diff --git a/lib/domains/edu/pomona.txt b/lib/domains/edu/pomona.txt
deleted file mode 100644
index 0317b17b33..0000000000
--- a/lib/domains/edu/pomona.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pomona College
diff --git a/lib/domains/edu/pugetsound.txt b/lib/domains/edu/pugetsound.txt
new file mode 100644
index 0000000000..dc1c4c6b9c
--- /dev/null
+++ b/lib/domains/edu/pugetsound.txt
@@ -0,0 +1 @@
+University of Puget Sound
\ No newline at end of file
diff --git a/lib/domains/edu/sfcollege.txt b/lib/domains/edu/sfcollege.txt
new file mode 100644
index 0000000000..93045deb44
--- /dev/null
+++ b/lib/domains/edu/sfcollege.txt
@@ -0,0 +1,2 @@
+Santa Fe College
+Santa Fe College
\ No newline at end of file
diff --git a/lib/domains/edu/sunyempire.txt b/lib/domains/edu/sunyempire.txt
new file mode 100644
index 0000000000..27426f6096
--- /dev/null
+++ b/lib/domains/edu/sunyempire.txt
@@ -0,0 +1 @@
+SUNY Empire State University
\ No newline at end of file
diff --git a/lib/domains/edu/tfc.txt b/lib/domains/edu/tfc.txt
new file mode 100644
index 0000000000..8586e390eb
--- /dev/null
+++ b/lib/domains/edu/tfc.txt
@@ -0,0 +1,2 @@
+Toccoa Falls College
+domain:  tfc.edu
diff --git a/lib/domains/edu/volstate.txt b/lib/domains/edu/volstate.txt
new file mode 100644
index 0000000000..e6b1c5d84b
--- /dev/null
+++ b/lib/domains/edu/volstate.txt
@@ -0,0 +1 @@
+Volunteer State Community College
diff --git a/lib/domains/edu/ws/senators.txt b/lib/domains/edu/ws/senators.txt
new file mode 100644
index 0000000000..7cb72691c3
--- /dev/null
+++ b/lib/domains/edu/ws/senators.txt
@@ -0,0 +1 @@
+Walters State
diff --git a/lib/domains/eg/edu/bnu.txt b/lib/domains/eg/edu/bnu.txt
deleted file mode 100644
index 56054ff4e5..0000000000
--- a/lib/domains/eg/edu/bnu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-جامعة بنها الأهلية
-Benha National University
\ No newline at end of file
diff --git a/lib/domains/es/ecam.txt b/lib/domains/es/ecam.txt
new file mode 100644
index 0000000000..8e38e52aca
--- /dev/null
+++ b/lib/domains/es/ecam.txt
@@ -0,0 +1 @@
+Escuela de Cinematografía y Audiovisual de la Comunidad de Madrid, ECAM
\ No newline at end of file
diff --git a/lib/domains/es/ifp.txt b/lib/domains/es/ifp.txt
new file mode 100644
index 0000000000..054e7044cc
--- /dev/null
+++ b/lib/domains/es/ifp.txt
@@ -0,0 +1,2 @@
+IFP Innovación en Formación profesional
+ifp.es
diff --git a/lib/domains/eu/c-a-g.txt b/lib/domains/eu/c-a-g.txt
new file mode 100644
index 0000000000..5ab7ffc1ef
--- /dev/null
+++ b/lib/domains/eu/c-a-g.txt
@@ -0,0 +1 @@
+Clemens-August-Gymnasium Cloppenburg
diff --git a/lib/domains/gr/edu/iekakmi.txt b/lib/domains/gr/edu/iekakmi.txt
new file mode 100644
index 0000000000..d674e76663
--- /dev/null
+++ b/lib/domains/gr/edu/iekakmi.txt
@@ -0,0 +1 @@
+ΙΕΚ ΑΚΜΗ
\ No newline at end of file
diff --git a/lib/domains/id/ac/poltera.txt b/lib/domains/id/ac/poltera.txt
deleted file mode 100644
index 873eab2ef6..0000000000
--- a/lib/domains/id/ac/poltera.txt
+++ /dev/null
@@ -1 +0,0 @@
-Politeknik Negeri Madura
\ No newline at end of file
diff --git a/lib/domains/il/org/manhischools.txt b/lib/domains/il/org/manhischools.txt
new file mode 100644
index 0000000000..0473cf2e0d
--- /dev/null
+++ b/lib/domains/il/org/manhischools.txt
@@ -0,0 +1,2 @@
+רנה קסין
+rene cassin
\ No newline at end of file
diff --git a/lib/domains/in/edu/aitpune.txt b/lib/domains/in/edu/aitpune.txt
new file mode 100644
index 0000000000..a4c1b783c7
--- /dev/null
+++ b/lib/domains/in/edu/aitpune.txt
@@ -0,0 +1 @@
+Army Institute of Technology
\ No newline at end of file
diff --git a/lib/domains/in/edu/ldc.txt b/lib/domains/in/edu/ldc.txt
new file mode 100644
index 0000000000..99a081ce7c
--- /dev/null
+++ b/lib/domains/in/edu/ldc.txt
@@ -0,0 +1 @@
+Lady Doak College, Madurai
\ No newline at end of file
diff --git a/lib/domains/in/edu/mahindrauniversity.txt b/lib/domains/in/edu/mahindrauniversity.txt
new file mode 100644
index 0000000000..930b5b8fc0
--- /dev/null
+++ b/lib/domains/in/edu/mahindrauniversity.txt
@@ -0,0 +1 @@
+Ecole Centrale School of Engineering Mahindra University
diff --git a/lib/domains/in/edu/pec.txt b/lib/domains/in/edu/pec.txt
new file mode 100644
index 0000000000..5490777ada
--- /dev/null
+++ b/lib/domains/in/edu/pec.txt
@@ -0,0 +1 @@
+"Punjab Engineering College (Deemed to be university) Chandigarh"
diff --git a/lib/domains/in/edu/plaksha.txt b/lib/domains/in/edu/plaksha.txt
new file mode 100644
index 0000000000..f6799ebab4
--- /dev/null
+++ b/lib/domains/in/edu/plaksha.txt
@@ -0,0 +1 @@
+Plaksha University
\ No newline at end of file
diff --git a/lib/domains/in/org/msec.txt b/lib/domains/in/org/msec.txt
new file mode 100644
index 0000000000..7040e59452
--- /dev/null
+++ b/lib/domains/in/org/msec.txt
@@ -0,0 +1 @@
+Mohamed Sathak Engineering College
\ No newline at end of file
diff --git a/lib/domains/in/org/skit.txt b/lib/domains/in/org/skit.txt
new file mode 100644
index 0000000000..2609ad8164
--- /dev/null
+++ b/lib/domains/in/org/skit.txt
@@ -0,0 +1 @@
+Sri Krishna Institute of Technology, Bengaluru
\ No newline at end of file
diff --git a/lib/domains/kr/ac/sou.txt b/lib/domains/kr/ac/sou.txt
new file mode 100644
index 0000000000..6c37555af8
--- /dev/null
+++ b/lib/domains/kr/ac/sou.txt
@@ -0,0 +1,2 @@
+서영대학교
+SEOYEONG University
\ No newline at end of file
diff --git a/lib/domains/lv/isma.txt b/lib/domains/lv/isma.txt
new file mode 100644
index 0000000000..cfbb9c0d5b
--- /dev/null
+++ b/lib/domains/lv/isma.txt
@@ -0,0 +1,2 @@
+Informacijas Sistemu Menedžmenta Augstskola
+Information Systems Management University
diff --git a/lib/domains/mx/edu/teccan.txt b/lib/domains/mx/edu/teccan.txt
new file mode 100644
index 0000000000..77bc753c69
--- /dev/null
+++ b/lib/domains/mx/edu/teccan.txt
@@ -0,0 +1,2 @@
+Tecnológico Nacional de Mexico Campus Cananea
+National Technological Institute of Mexico, Cananea Campus
\ No newline at end of file
diff --git a/lib/domains/my/edu/lincoln.txt b/lib/domains/my/edu/lincoln.txt
new file mode 100644
index 0000000000..352b87ce1b
--- /dev/null
+++ b/lib/domains/my/edu/lincoln.txt
@@ -0,0 +1 @@
+Lincoln University College
diff --git a/lib/domains/net/aearraiolos.txt b/lib/domains/net/aearraiolos.txt
new file mode 100644
index 0000000000..a705119028
--- /dev/null
+++ b/lib/domains/net/aearraiolos.txt
@@ -0,0 +1 @@
+Agrupamento de Escolas de Arraiolos - EB 2,3/S de Cunha Rivara
\ No newline at end of file
diff --git a/lib/domains/net/lpsfrisco.txt b/lib/domains/net/lpsfrisco.txt
new file mode 100644
index 0000000000..edc92e6261
--- /dev/null
+++ b/lib/domains/net/lpsfrisco.txt
@@ -0,0 +1 @@
+Leadership Prep School Secondary Campus, Frisco, Tx
diff --git a/lib/domains/ng/edu/nsuk.txt b/lib/domains/ng/edu/nsuk.txt
new file mode 100644
index 0000000000..ac93b8a005
--- /dev/null
+++ b/lib/domains/ng/edu/nsuk.txt
@@ -0,0 +1 @@
+Nasarawa State University, Keffi
\ No newline at end of file
diff --git a/lib/domains/np/edu/radiantcollege.txt b/lib/domains/np/edu/radiantcollege.txt
new file mode 100644
index 0000000000..d0632ff290
--- /dev/null
+++ b/lib/domains/np/edu/radiantcollege.txt
@@ -0,0 +1,2 @@
+रेडियन्ट कलेज
+Radiant College
diff --git a/lib/domains/np/edu/virinchicollege.txt b/lib/domains/np/edu/virinchicollege.txt
new file mode 100644
index 0000000000..aa281e3383
--- /dev/null
+++ b/lib/domains/np/edu/virinchicollege.txt
@@ -0,0 +1 @@
+Virinchi College
\ No newline at end of file
diff --git a/lib/domains/org/newarkcityschools.txt b/lib/domains/org/newarkcityschools.txt
new file mode 100644
index 0000000000..644f13d17f
--- /dev/null
+++ b/lib/domains/org/newarkcityschools.txt
@@ -0,0 +1,2 @@
+Newark City Schools
+Newark City Schools
diff --git a/lib/domains/org/tmuni.txt b/lib/domains/org/tmuni.txt
new file mode 100644
index 0000000000..e0d56785e1
--- /dev/null
+++ b/lib/domains/org/tmuni.txt
@@ -0,0 +1 @@
+Tashkent Metropolitan University
\ No newline at end of file
diff --git a/lib/domains/pe/edu/unamad.txt b/lib/domains/pe/edu/unamad.txt
new file mode 100644
index 0000000000..20322d8b92
--- /dev/null
+++ b/lib/domains/pe/edu/unamad.txt
@@ -0,0 +1 @@
+UNIVERSIDAD NACIONAL AMAZONICA DE MADRE DE DIOS
\ No newline at end of file
diff --git a/lib/domains/ps/edu/aaup.txt b/lib/domains/ps/edu/aaup.txt
new file mode 100644
index 0000000000..afd17ff22e
--- /dev/null
+++ b/lib/domains/ps/edu/aaup.txt
@@ -0,0 +1 @@
+Arab American University
diff --git a/lib/domains/ro/bolyai.txt b/lib/domains/ro/bolyai.txt
new file mode 100644
index 0000000000..6711036cf6
--- /dev/null
+++ b/lib/domains/ro/bolyai.txt
@@ -0,0 +1 @@
+Bolyai Farkas Elmeleti Liceum
\ No newline at end of file
diff --git a/lib/domains/stoplist.txt b/lib/domains/stoplist.txt
index 638bbec896..ba731a51f2 100644
--- a/lib/domains/stoplist.txt
+++ b/lib/domains/stoplist.txt
@@ -755,4 +755,14 @@ stu.lyceegalilee.fr
 blue.knue.ac.kr
 alunoavemaria.g12.br
 dkps.uniburgas.bg
-acc.msu.ac.th
\ No newline at end of file
+acc.msu.ac.th
+hxu.ac.cn
+ena.edu.ci
+foxespiece.org.uk
+ds.lib.uw.edu
+gpraj.gujgov.edu.in
+mpi.dk
+bnu.edu.eg
+member.scau.ac.kr
+fzu.edu.kg
+uat.edu.ng
\ No newline at end of file
diff --git a/lib/domains/th/ac/western.txt b/lib/domains/th/ac/western.txt
new file mode 100644
index 0000000000..fe48028ee0
--- /dev/null
+++ b/lib/domains/th/ac/western.txt
@@ -0,0 +1,2 @@
+มหาวิทยาลัยเวสเทิร์น
+Western University
\ No newline at end of file
diff --git a/lib/domains/tlds.txt b/lib/domains/tlds.txt
index b7ed68e17b..d164f0b6b6 100644
--- a/lib/domains/tlds.txt
+++ b/lib/domains/tlds.txt
@@ -28,7 +28,6 @@ edu.dz
 edu.ee
 edu.er
 edu.hk
-edu.in
 edu.kz
 edu.lr
 edu.ly
diff --git a/lib/domains/tn/ucar/isgb.txt b/lib/domains/tn/ucar/isgb.txt
new file mode 100644
index 0000000000..785752e1e1
--- /dev/null
+++ b/lib/domains/tn/ucar/isgb.txt
@@ -0,0 +1,2 @@
+institut supérieur de gestion de bizerte
+Higher Institute of Management Bizerte
\ No newline at end of file
diff --git a/lib/domains/uk/ac/solihullsfc.txt b/lib/domains/uk/ac/solihullsfc.txt
new file mode 100644
index 0000000000..f5a361d9cf
--- /dev/null
+++ b/lib/domains/uk/ac/solihullsfc.txt
@@ -0,0 +1 @@
+Solihull Sixth Form College
\ No newline at end of file
diff --git a/lib/domains/vn/mit.txt b/lib/domains/vn/mit.txt
new file mode 100644
index 0000000000..069a639178
--- /dev/null
+++ b/lib/domains/vn/mit.txt
@@ -0,0 +1 @@
+student.mit.vn