diff --git a/database/groups.py b/database/groups.py
index 98e2580d7241cd212b03d4f3a5b3e2685110d930..9ee7fa6388832e1c0ea3cf08f4188c1c7906c623 100644
--- a/database/groups.py
+++ b/database/groups.py
@@ -40,7 +40,10 @@ PROUNI = [
     'prouni.sql'
 ]
 PNAD = [
-    'pnad.sql'
+    'pnad.sql',
+    'jvt_viva_educacao.sql',
+    'jvt_viva_trabalho.sql'
+
 ]
 CADUNICO = [
     'eixo2.sql',
@@ -48,14 +51,22 @@ CADUNICO = [
     'eixo4.sql',
     'african_sustentability.sql',
     'african_rights.sql',
-    'african_culture.sql'
+    'african_culture.sql',
+    'ciganos_culture.sql',
+    'ciganos_rights.sql',
+    'ciganos_sustentability.sql'
 ]
 FIES = [
     'courseFIES.sql',
     'fies.sql',
     'institutionFIES.sql'
 ]
-ALL_GROUPS_SMPPIR = INEP + PROUNI + PNAD + CADUNICO + FIES
+
+SIM = [ 
+    'homicidios.sql'
+]
+
+ALL_GROUPS_SMPPIR = INEP + PROUNI + PNAD + CADUNICO + FIES + SIM
 # ---------------------------------------------------------------------------------------#
 
 # ---------------------------------------------------------------------------------------#
diff --git a/mapping-protocols b/mapping-protocols
index 0014f2394e674fa5c6e461bbc2b98e8f78c3b923..df45e2cd58b506c0467a83abd909f8a251bdbaa5 160000
--- a/mapping-protocols
+++ b/mapping-protocols
@@ -1 +1 @@
-Subproject commit 0014f2394e674fa5c6e461bbc2b98e8f78c3b923
+Subproject commit df45e2cd58b506c0467a83abd909f8a251bdbaa5
diff --git a/sql-scripts b/sql-scripts
index 87666dc7f49b358daf0fc81c751ee36e46bc81f0..1970abd8c07ff01fe61f75007655e2e11288808f 160000
--- a/sql-scripts
+++ b/sql-scripts
@@ -1 +1 @@
-Subproject commit 87666dc7f49b358daf0fc81c751ee36e46bc81f0
+Subproject commit 1970abd8c07ff01fe61f75007655e2e11288808f
diff --git a/table-definitions b/table-definitions
index cdea443e34bf09df2223aebe3090c6920442a38a..d5ede23aeb80f65dc6caf596101226c7c8f300b9 160000
--- a/table-definitions
+++ b/table-definitions
@@ -1 +1 @@
-Subproject commit cdea443e34bf09df2223aebe3090c6920442a38a
+Subproject commit d5ede23aeb80f65dc6caf596101226c7c8f300b9