diff --git a/data/h3_data_importer/Makefile b/data/h3_data_importer/Makefile
index a63debd17..696eef547 100644
--- a/data/h3_data_importer/Makefile
+++ b/data/h3_data_importer/Makefile
@@ -21,7 +21,9 @@ WORKDIR_DEFORESTATION=data/hansen_loss
 WORKDIR_GHG=data/forest_ghg
 WORKDIR_WOODPULP=data/woodpulp
 WORKING_NATURAL_CROP_CONVERSION=data/natural_crop_conversion
-WORKDIR_MAPSPAM_GHG=data/mapspam_ghg
+WORKDIR_NUTRIENT_LOAD_REDUCTION=data/nutrient_load_reduction
+WORKDIR_BIODIVERSITY=data/biodiversity
+WORKDIR_GHG_FARM=data/ghg_farm
 
 
 CHECKSUMS_PATH=data_checksums
@@ -56,9 +58,9 @@ indicators:
 	make convert-nutrientLoadReduction
 	make convert-biodiversity
 	make convert-ghg-farm
-contextual-layers: convert-hdi-contextual convert-blue-water-contextual
-
+indicators: convert-aqueduct convert-deforestation convert-forestGHG convert-satDeforestation convert-naturalCropConversion convert-ghg-farm
 
+contextual-layers: convert-hdi-contextual convert-blue-water-contextual
 
 download-mapspam-crop-production:
 	mkdir -p $(WORKDIR_MAPSPAM_PROD)
@@ -70,8 +72,8 @@ convert-mapspam-crop-production: download-mapspam-crop-production
 
 download-mapspam-crop-harvest:
 	mkdir -p $(WORKDIR_MAPSPAM_HA)
-	aws s3 sync $(AWS_S3_BUCKET_URL)/processed/mapspam/spam2010v2r0_global_ha $(WORKDIR_MAPSPAM_HA)
-	cd $(WORKDIR_MAPSPAM_HA) && sha256sum --check ../../$(CHECKSUMS_PATH)/mapspam_ha
+	aws s3 sync $(AWS_S3_BUCKET_URL)/processed/mapspam/spam2010v2r0_global_ha $(WORKDIR_)
+	cd $(WORKDIR_MAPSPAM_HA) && sha256sum --check ../../$(CHECKSUMS_PATH)/ghg_from_farm_emissions
 
 convert-mapspam-crop-harvest: download-mapspam-crop-harvest
 	python raster_folder_to_h3_table.py $(WORKDIR_MAPSPAM_HA) h3_grid_spam2010v2r0_global_ha harvest_area spam 2010 --h3-res=6 --thread-count=$(PARALLELIZATION_FACTOR)