diff --git a/.gitignore b/.gitignore
index ec21e290..d9f5f43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,7 +139,7 @@ toremove/
 
 reports/*.csv
 apps/
-data/
+*.db
 static_data/app-info.db.gz
 static_data/all_android_apps_5k_*.csv
 webstatic/images/tmp.png
diff --git a/.gitmodules b/.gitmodules
index a65eee41..e4d24090 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "stalkerware-indicators"]
-	path = stalkerware-indicators
+[submodule "data/stalkerware-indicators"]
+	path = data/stalkerware-indicators
 	url = git@github.com:AssoEchap/stalkerware-indicators.git
diff --git a/data/stalkerware-indicators b/data/stalkerware-indicators
new file mode 160000
index 00000000..78fbec85
--- /dev/null
+++ b/data/stalkerware-indicators
@@ -0,0 +1 @@
+Subproject commit 78fbec85cca16e460707072d0b13f14243f77d98
diff --git a/static_data/app-flags.csv b/static_data/app-flags.csv
index 3b016586..b6c05067 100644
--- a/static_data/app-flags.csv
+++ b/static_data/app-flags.csv
@@ -5156,13 +5156,34 @@ com.probit.flare,playstore,spyware,
 com.camhart.netcountable,playstore,spyware,
 com.contentwatch.ghoti.cp2.child,playstore,spyware,
 com.timeon.litclient,playstore,spyware,
-com.surebrec,playstore,spyware,Cerberus
-com.ssurebrec,playstore,spyware,Cerberus
-com.tutorial.instalao,playstore,spyware,MeuSpy
-com.aisistem.instalao,playstore,spyware,MeuSpy
-br.com.appfornecedor.legal,playstore,spyware,MeuSpy
-com.mtf.download,playstore,spyware,MobileTrackerFree / MonitorLoverman / MTrack / CellTracker / TrackMobil
-iiw.orqjtwbkx,playstore,spyware,MonitorChecker / AndrMonitor / AndroidMon / Dromon
-efexmsz.mzuooelftl,playstore,spyware,MonitorChecker / AndrMonitor / AndroidMon / Dromon
-com.wisemo.wsmguest.v18,playstore,spyware,
-org.findmykids.child,playstore,spyware,
+com.android.core.mntah,playstore,spyware,"Hoverwatch,SpyBubble,Refog"
+com.lsdroid.cerberus.persona2,playstore,spyware,Cerberus
+com.surebrec,playstore,spyware,Cerberus
+com.ssurebrec,playstore,spyware,Cerberus
+com.tutorial.instalao,playstore,spyware,MeuSpy
+com.aisistem.instalao,playstore,spyware,MeuSpy
+br.com.appfornecedor.legal,playstore,spyware,MeuSpy
+com.mtf.download,playstore,spyware,"MobileTrackerFree,MonitorLoverman,MTrack,CellTracker,TrackMobil"
+iiw.orqjtwbkx,playstore,spyware,"MonitorChecker,AndrMonitor,AndroidMon,Dromon"
+efexmsz.mzuooelftl,playstore,spyware,"MonitorChecker,AndrMonitor,AndroidMon,Dromon"
+com.fhekpqbq.otlzonjx,playstore,spyware,"TiSpy,KidLogger,MonitorMinor,SelfSpy,SpyTrac,TelcadoAndroid,TiFamily,TracerSpy,Triada,VipTelefonProgrami"
+com.android.settings.app,playstore,spyware,"OneMonitar,OneSpy,ChyldMonitor"
+com.wisemo.wsmguest.v18,playstore,spyware,
+org.findmykids.child,playstore,spyware,
+com.moxlndmp.uhzhgzjh,playstore,spyware,
+com.fzvsdrtb.qamlhxri,playstore,spyware,
+com.jgeuhcex.ejcxndak,playstore,spyware,
+com.eytewqrm.wvdkgmrl,playstore,spyware,
+com.epbzrqcg.syzzkuqx,playstore,spyware,
+com.laucass.phonecontrolenabler,playstore,spyware,
+com.laucass.phonecontroltarget,playstore,spyware,
+com.surebrec,playstore,spyware,Cerberus
+com.ssurebrec,playstore,spyware,Cerberus
+com.tutorial.instalao,playstore,spyware,MeuSpy
+com.aisistem.instalao,playstore,spyware,MeuSpy
+br.com.appfornecedor.legal,playstore,spyware,MeuSpy
+com.mtf.download,playstore,spyware,MobileTrackerFree / MonitorLoverman / MTrack / CellTracker / TrackMobil
+iiw.orqjtwbkx,playstore,spyware,MonitorChecker / AndrMonitor / AndroidMon / Dromon
+efexmsz.mzuooelftl,playstore,spyware,MonitorChecker / AndrMonitor / AndroidMon / Dromon
+com.wisemo.wsmguest.v18,playstore,spyware,
+org.findmykids.child,playstore,spyware,
\ No newline at end of file