diff --git a/infraestrutura.sql b/infraestrutura.sql
index fbe953dc9a78be3341b2580bc58a7326b58bfaa4..ef2d994a4d1558df80b25ac35218fb0b0bc30f78 100644
--- a/infraestrutura.sql
+++ b/infraestrutura.sql
@@ -41,6 +41,7 @@ WITH tabela_base AS(
 
 	biblioteca_1 AS (
 	SELECT
+		ano_censo,
 		1 AS "scholar_dependency_id",
 		'Biblioteca' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND localizacao_id=1 THEN 1 ELSE 0 END AS "total_schools",
@@ -51,6 +52,7 @@ WITH tabela_base AS(
 
 	sala_de_leitura_2 AS (
 	SELECT
+		ano_censo,
 		2 AS "scholar_dependency_id",
 		'Sala de leitura' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND localizacao_id=2 THEN 1 ELSE 0 END AS "total_schools",
@@ -61,6 +63,7 @@ WITH tabela_base AS(
 
 	laboratorio_de_informatica_3 AS (
 	SELECT
+		ano_censo,
 		3 AS "scholar_dependency_id",
 		'Laboratório de informática' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND (etapa_en_fundamental_anos_iniciais=1 OR etapa_en_fundamental_anos_finais=1 OR eja_en_fundamental=1) THEN 1 ELSE 0 END AS "total_schools",
@@ -71,6 +74,7 @@ WITH tabela_base AS(
 
 	laboratorio_de_ciencias_4 AS (
 	SELECT
+		ano_censo,
 		4 AS "scholar_dependency_id",
 		'Laboratório de ciências' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND (etapa_en_fundamental_anos_finais=1 OR eja_en_fundamental=1) THEN 1 ELSE 0 END AS "total_schools",
@@ -81,6 +85,7 @@ WITH tabela_base AS(
 
 	parque_infantil_5 AS (
 	SELECT
+		ano_censo,
 		5 AS "scholar_dependency_id",
 		'Parque infantil' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND (etapa_ed_infantil_creche=1 OR etapa_ed_infantil_pre_escola=1 OR etapa_en_fundamental_anos_iniciais=1) THEN 1 ELSE 0 END AS "total_schools",
@@ -91,6 +96,7 @@ WITH tabela_base AS(
 
 	quadra_poliesportiva_6 AS (
 	SELECT
+		ano_censo,
 		6 AS "scholar_dependency_id",
 		'Quadra poliesportiva' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND (etapa_en_fundamental_anos_iniciais=1 OR etapa_en_fundamental_anos_finais=1 OR eja_en_fundamental=1) THEN 1 ELSE 0 END AS "total_schools",
@@ -101,6 +107,7 @@ WITH tabela_base AS(
 
 	quadras_a_serem_cobertas_7 AS (
 	SELECT
+		ano_censo,
 		7 AS "scholar_dependency_id",
 		'Quadras a serem cobertas' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND (etapa_en_fundamental_anos_iniciais=1 OR etapa_en_fundamental_anos_finais=1 OR eja_en_fundamental=1)AND quadra_esportes_descoberta=1 THEN 1 ELSE 0 END AS "total_schools",
@@ -111,6 +118,7 @@ WITH tabela_base AS(
 
 	patio_8 AS (
 	SELECT
+		ano_censo,
 		8 AS "scholar_dependency_id",
 		'Pátio' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -121,6 +129,7 @@ WITH tabela_base AS(
 
 	patios_a_serem_cobertos_9 AS (
 	SELECT
+		ano_censo,
 		9 AS "scholar_dependency_id",
 		'Pátios a serem cobertos' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND patio=1 THEN 1 ELSE 0 END AS "total_schools",
@@ -131,6 +140,7 @@ WITH tabela_base AS(
 
 	sala_de_direcao_10 AS (
 	SELECT
+		ano_censo,
 		10 AS "scholar_dependency_id",
 		'Sala de direção ' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND localizacao_id=1 THEN 1 ELSE 0 END AS "total_schools",
@@ -141,6 +151,7 @@ WITH tabela_base AS(
 
 	secretaria_11 AS (
 	SELECT
+		ano_censo,
 		11 AS "scholar_dependency_id",
 		'Secretaria' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -151,6 +162,7 @@ WITH tabela_base AS(
 
 	sala_de_professores_12 AS (
 	SELECT
+		ano_censo,
 		12 AS "scholar_dependency_id",
 		'Sala de professores' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -161,6 +173,7 @@ WITH tabela_base AS(
 
 	cozinha_13 AS (
 	SELECT
+		ano_censo,
 		13 AS "scholar_dependency_id",
 		'Cozinha' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -171,6 +184,7 @@ WITH tabela_base AS(
 
 	despensa_14 AS (
 	SELECT
+		ano_censo,
 		14 AS "scholar_dependency_id",
 		'Despensa' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -181,6 +195,7 @@ WITH tabela_base AS(
 
 	almoxarifado_15 AS (
 	SELECT
+		ano_censo,
 		15 AS "scholar_dependency_id",
 		'Almoxarifado' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -191,6 +206,7 @@ WITH tabela_base AS(
 
 	internet_16 AS (
 	SELECT
+		ano_censo,
 		16 AS "scholar_dependency_id",
 		'Internet' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND localizacao_id=2 THEN 1 ELSE 0 END AS "total_schools",
@@ -201,6 +217,7 @@ WITH tabela_base AS(
 
 	internet_banda_larga_17 AS (
 	SELECT
+		ano_censo,
 		17 AS "scholar_dependency_id",
 		'Internet banda larga' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND localizacao_id=1 THEN 1 ELSE 0 END AS "total_schools",
@@ -211,6 +228,7 @@ WITH tabela_base AS(
 
 	banheiro_dentro_do_predio_18 AS (
 	SELECT
+		ano_censo,
 		18 AS "scholar_dependency_id",
 		'Banheiro dentro do prédio' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -221,6 +239,7 @@ WITH tabela_base AS(
 
 	banheiro_adequado_para_educacao_infantil_dentro_do_predio_19 AS (
 	SELECT
+		ano_censo,
 		19 AS "scholar_dependency_id",
 		'Banheiro adequado para educação infantil dentro do prédio' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND (etapa_ed_infantil_creche=1 OR etapa_ed_infantil_pre_escola=1 OR etapa_en_fundamental_anos_iniciais=1) THEN 1 ELSE 0 END AS "total_schools",
@@ -231,6 +250,7 @@ WITH tabela_base AS(
 
 	fornecimento_de_energia_20 AS (
 	SELECT
+		ano_censo,
 		20 AS "scholar_dependency_id",
 		'Fornecimento de energia' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -241,6 +261,7 @@ WITH tabela_base AS(
 
 	abastecimento_de_agua_21 AS (
 	SELECT
+		ano_censo,
 		21 AS "scholar_dependency_id",
 		'Abastecimento de água' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -251,6 +272,7 @@ WITH tabela_base AS(
 
 	agua_filtrada_22 AS (
 	SELECT
+		ano_censo,
 		22 AS "scholar_dependency_id",
 		'Água filtrada' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -261,6 +283,7 @@ WITH tabela_base AS(
 
 	coleta_de_esgoto_23 AS (
 	SELECT
+		ano_censo,
 		23 AS "scholar_dependency_id",
 		'Coleta de esgoto' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -271,6 +294,7 @@ WITH tabela_base AS(
 
 	dependencias_adaptadas_para_pessoas_com_deficiencias_24 AS (
 	SELECT
+		ano_censo,
 		24 AS "scholar_dependency_id",
 		'Dependências adaptadas para pessoas com deficiências' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
@@ -281,6 +305,7 @@ WITH tabela_base AS(
 
 	banheiros_adaptados_para_pessoas_com_deficiencias_25 AS (
 	SELECT
+		ano_censo,
 		25 AS "scholar_dependency_id",
 		'Banheiros adaptados para pessoas com deficiências' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",