diff --git a/workspace/R/config.R b/workspace/R/config.R
index 6ebf0344aeecc62f42ca75cb8adf0e321e06f2d0..2d54abeac9755fdbb5924708eb68cde3adf53f54 100644
--- a/workspace/R/config.R
+++ b/workspace/R/config.R
@@ -26,11 +26,13 @@ if(!exists("rpu_code")) {
     rpu_code <- vpu$r
     vpu <- vpu$v
     rpu_codes <- rpu_vpu[rpu_vpu$vpuid %in% vpu, ]
+    vpu_codes <- VPU <- vpu
   }
 }
 
 if(!exists("vpu")) {
   vpu <- get_rpu_dependent_vars(rpu_code)$v
+  vpu_codes <- VPU <- vpu 
 }
 
 if(!nchar(out_agg_gpkg <- Sys.getenv("OUT_GPKG")) > 5) 
@@ -61,6 +63,7 @@ suppressWarnings(staged_nhd <- stage_national_data())
 # Defined and used broadly
 nhd_flowline <- "reference_flowline"
 nhd_catchment <- "reference_catchment"
+nhd_waterbody <- "reference_waterbody"
 nhd_outlet <- "nhd_outlet"
 nhd_network <- "reference_network"
 
@@ -96,6 +99,12 @@ poi_xwalk_layer <- paste0("poi_xwalk_layer_", vpu) # POIs that changed COMIDS du
 final_poi_layer <- "POIs"
 dup_pois <- "dup_POIs"
 
+poi_data_table <- "poi_data"
+poi_geometry_table <- "poi_geometry_table"
+
+event_table <- "event_data"
+event_geometry_table <- "event_geometry_table"
+
 # Settings for refactor workflow
 split_meters <- 10000
 combine_meters <- 1000
@@ -126,6 +135,7 @@ catchment_network_table <- "catchment_network"
 CAC_thresh <- 0.66 # Coefficient of areal correspondence threshold
 
 # output geopackage file names
+ref_gpkg <- file.path(data_paths$ref_fab_directory, paste0(vpu, "_reference_features.gpkg"))
 nav_gpkg <- file.path("cache", paste0("reference_", vpu,".gpkg"))
 temp_gpkg <- file.path("cache", paste0("nav_", vpu,".gpkg"))