diff --git a/R/EQ_DomainValues.R b/R/EQ_DomainValues.R
index ab4c2c6..e37cdcf 100644
--- a/R/EQ_DomainValues.R
+++ b/R/EQ_DomainValues.R
@@ -19,8 +19,8 @@
 #' param_attain (Parameter Attainment), param_group (Parameter Group), param_name
 #' (Parameter Name), param_state_ir_code (Parameter State Integrated Report Code),
 #' param_status (Parameter Status), source_scale (Source Scale), source_type (Source
-#' Type), statecode (State), use_name (Use Name), use_support (Use Support), and
-#' water_type (Water Type).
+#' Type), statecode (State), use_name (Use Name), use_class (Use Class), use_support
+#' (Use Support), and water_type (Water Type).
 #'
 #' Default is NULL. When param = NULL, the df returned will list all domains for
 #' which an allowable list of values can be returned from ATTAINS web services.
diff --git a/R/EQ_HelperFunctions.R b/R/EQ_HelperFunctions.R
index 2b7f0ad..eb3026f 100644
--- a/R/EQ_HelperFunctions.R
+++ b/R/EQ_HelperFunctions.R
@@ -26,8 +26,7 @@ EQ_ExtractParams <- function(extract = NULL) {
   params.cw <- readr::read_csv(system.file("extdata", "EQParamsCrosswalk.csv",
     package = "rExpertQuery"
   ), show_col_types = FALSE) |>
-    dplyr::filter(get(extract.filter) == "yes") |>
-    # dplyr::filter(.data[[extract.filter]] == "yes") |>
+    dplyr::filter(!!rlang::sym(extract.filter) == "yes") |>
     dplyr::select("param", "eq_name")
 
   # return the crosswalk
diff --git a/inst/extdata/EQParamsCrosswalk.csv b/inst/extdata/EQParamsCrosswalk.csv
index e16c76d..c91dad4 100644
--- a/inst/extdata/EQParamsCrosswalk.csv
+++ b/inst/extdata/EQParamsCrosswalk.csv
@@ -1 +1,101 @@
-""
+param,eq_name,attains_ws_name,attains_ws_field,actions,action_documents,assessments,assessment_units,assessment_units_mls,catchment_correspondence,sources,tmdl
+act_agency,actionAgency,AgencyCode,name,yes,no,no,no,no,no,no,yes
+act_agency,associatedActionAgency,AgencyCode,name,no,no,yes,no,no,no,no,no
+act_id,actionId,,,yes,yes,no,no,no,no,no,yes
+act_id,associatedActionId,,,no,no,yes,no,no,no,no,no
+act_name,actionName,,,yes,yes,yes,no,no,no,no,yes
+act_status,associatedActionStatus,ActionStatusType,name,no,no,yes,no,no,no,no,no
+act_type,actionType,ActionType,code,yes,yes,yes,no,no,no,no,no
+ad_param,addressedParameter,ParameterName,name,no,no,no,no,no,no,no,yes
+ad_param_group,addressedParameterGroup,ParameterGroupCodeType,name,no,no,no,no,no,no,no,yes
+alt_list_id,alternateListingIdentifier,,,no,no,yes,no,no,no,no,no
+assess_basis,assessmentBasis,AssessmentBasisCode,name,no,no,yes,no,no,no,no,no
+assess_date_end,assessmentDateHi,,,no,no,yes,no,no,no,no,no
+assess_date_start,assessmentDateLo,,,no,no,yes,no,no,no,no,no
+assess_methods,assessmentMethods,MethodTypeCode,name,no,no,yes,no,no,no,no,no
+assess_types,assessmentTypes,AssessmentTypeCode,name,no,no,yes,no,no,no,no,no
+au_name,assessmentUnitName,,,yes,no,yes,yes,yes,yes,yes,yes
+au_status,assessmentUnitStatus,StatusIndicator,name,no,no,yes,yes,yes,no,no,no
+auid,assessmentUnitId,,,yes,no,yes,yes,yes,yes,yes,yes
+cause,causeName,ParameterName,name,no,no,no,no,no,no,yes,no
+cd_cycle_end,consentDecreeCycleHi,,,no,no,yes,no,no,no,no,no
+cd_cycle_start,consentDecreeCycleLo,,,no,no,yes,no,no,no,no,no
+comp_date_end,completionDateHi,,,yes,yes,no,no,no,no,no,yes
+comp_date_start,completionDateLo,,,yes,yes,no,no,no,no,no,yes
+confirmed,confirmed,,,no,no,no,no,no,no,yes,no
+cwa,cwa303dPriorityRanking,,,no,no,yes,no,no,no,no,no
+cycle_first_end,cycleFirstListedHi,,,no,no,yes,no,no,no,no,no
+cycle_first_start,cycleFirstListedLo,,,no,no,yes,no,no,no,no,no
+cycle_id,cycleId,,,no,no,yes,yes,yes,yes,yes,no
+cycle_last_end,cycleLastAssessedHi,,,no,no,yes,yes,no,no,no,no
+cycle_last_start,cycleLastAssessedLo,,,no,no,yes,yes,no,no,no,no
+delist_reason,delistedReason,DelistingReasonCode,name,no,no,yes,no,no,no,no,no
+delisted,delisted,,,no,no,yes,no,no,no,no,no
+doc_file_name,documentFileName,,,no,yes,no,no,no,no,no,no
+doc_key,documentKey,,,no,no,no,no,no,no,no,no
+doc_name,documentName,,,no,yes,no,no,no,no,no,no
+doc_query,documentQuery,,,no,yes,no,no,no,no,no,no
+doc_type,actionDocumentType,ActionDocumentType,name,no,yes,no,no,no,no,no,no
+doc_url,actionDocumentUrl,,,no,no,no,no,no,no,no,no
+epa_ir_cat,epaIrCategory,,,no,no,yes,no,no,no,yes,no
+expect_attain_cycle_hi,cycleExpectedToAttainHi,,,no,no,yes,no,no,no,no,no
+expect_attain_cycle_lo,cycleExpectedToAttainLo,,,no,no,yes,no,no,no,no,no
+file_type,documentFileTypeName,DocumentFileType,name,no,no,no,no,no,no,no,no
+fisc_year_end,fiscalYearEstablishedHi,,,yes,no,no,no,no,no,no,yes
+fisc_year_start,fiscalYearEstablishedLo,,,yes,no,no,no,no,no,no,yes
+in_meas,includeInMeasure,,,yes,no,no,no,no,no,no,yes
+indian_country,inIndianCountry,,,yes,no,no,no,no,no,no,yes
+loc_desc,locationDescription,,,no,no,yes,no,no,no,no,no
+loc_txt,locationText,,,no,no,no,yes,no,no,no,no
+loc_type,locationTypeCode,LocationTypeCode,name,no,no,no,yes,no,no,no,no
+mon_end_date_hi,monitoringEndDateHi,,,no,no,yes,no,no,no,no,no
+mon_end_date_lo,monitoringEndDateLo,,,no,no,yes,no,no,no,no,no
+mon_loc_id,monitoringLocationId,,,no,no,no,no,yes,no,no,no
+mon_loc_org,monitoringLocationOrgId,,,no,no,no,no,yes,no,no,no
+mon_start_date_hi,monitoringStartDateHi,,,no,no,yes,no,no,no,no,no
+mon_start_date_lo,monitoringStartDateLo,,,no,no,yes,no,no,no,no,no
+mos_exp,explicitMarginOfSafety,,,no,no,no,no,no,no,no,yes
+mos_imp,implicitMarginOfSafety,,,no,no,no,no,no,no,no,yes
+nhd_id,catchmentNhdPlusId,,,no,no,no,no,yes,no,no,no
+npdes_id,npdesIdentifier,,,no,no,no,no,no,no,no,yes
+obj_id,objectId,,,no,no,no,no,yes,yes,yes,yes
+org_id,organizationId,OrgName,code,yes,yes,yes,no,yes,yes,yes,yes
+org_name,organizationName,OrgName,name,yes,yes,yes,no,yes,yes,yes,yes
+org_type,organizationType,,,no,no,yes,no,yes,yes,yes,yes
+other_id,otherIdentifier,,,no,no,no,no,no,no,no,yes
+overall_status,overallStatus,,,no,no,yes,no,no,no,yes,no
+param_attain,parameterAttainment,ParameterAttainmentCode,name,no,no,yes,no,no,no,no,no
+param_group,parameterGroup,ParameterGroupCodeType,name,yes,no,yes,no,no,no,yes,no
+param_ir_cat,parameterIrCategory,,,no,no,yes,no,no,no,no,no
+param_name,parameterName,ParameterName,name,yes,no,yes,no,no,no,no,no
+param_state_ir_cat,parameterStateIrCategory,StateIRCategoryCode,name,no,no,yes,no,no,no,no,no
+param_status,parameterStatus,ParameterStatus,name,no,no,yes,no,no,no,no,no
+poll_group,pollutantGroup,,,no,no,no,no,no,no,no,yes
+pollut_ind,pollutantIndicator,,,no,no,yes,no,no,no,no,no
+pollutant,pollutant,,,no,no,no,no,no,no,no,yes
+region,region,,,yes,yes,yes,yes,yes,yes,yes,yes
+report_cycle,reportingCycle,,,no,no,yes,yes,yes,yes,yes,no
+seas_end_date_hi,seasonEndDateHi,,,no,no,yes,no,no,no,no,no
+seas_end_date_lo,seasonEndDateLo,,,no,no,yes,no,no,no,no,no
+seas_start_date_hi,seasonStartDateHi,,,no,no,yes,no,no,no,no,no
+seas_start_date_lo,seasonStartDateLo,,,no,no,yes,no,no,no,no,no
+size_source,sizeSource,,,no,no,yes,no,no,no,no,no
+size_units,waterSizeUnits,,,no,no,yes,no,no,no,no,no
+source,sourceName,,,no,no,no,no,no,no,yes,no
+source_scale,sourceScale,SizeSourceScaleText,name,no,no,yes,no,no,no,no,no
+source_type,sourceType,SourceName,name,no,no,no,no,no,no,no,yes
+state_ir_cat,stateIrCategory,,,no,no,yes,no,no,no,yes,no
+statecode,state,OrgStateCode,name,yes,yes,yes,yes,yes,yes,yes,yes
+tmdl_cycle_hi,cycleScheduledForTmdlHi,,,no,no,yes,no,no,no,no,no
+tmdl_cycle_lo,cycleScheduledForTmdlLo,,,no,no,yes,no,no,no,no,no
+tmdl_date_end,tmdlDateHi,,,no,yes,no,no,no,no,no,yes
+tmdl_date_start,tmdlDateLo,,,no,yes,no,no,no,no,no,yes
+use_class,useClassName,UseClassUse,name,no,no,yes,yes,yes,no,no,no
+use_group,useGroup,,,no,no,yes,no,no,no,no,no
+use_ir_cat,useIrCategory,,,no,no,yes,no,no,no,no,no
+use_name,useName,UseName,name,no,no,yes,no,no,no,no,no
+use_state_ir_cat,useStateIrCategory,,,no,no,yes,no,no,no,no,no
+use_support,useSupport,UseAttainmentCode,name,no,no,yes,no,no,no,no,no
+vis,vision303dPriority,,,no,no,yes,no,no,no,no,no
+water_size,waterSize,,,no,no,yes,no,no,no,no,no
+water_type,waterType,WaterTypeCode,name,yes,no,yes,yes,yes,no,yes,yes
diff --git a/man/EQ_DomainValues.Rd b/man/EQ_DomainValues.Rd
index e80ea67..ab7892a 100644
--- a/man/EQ_DomainValues.Rd
+++ b/man/EQ_DomainValues.Rd
@@ -23,8 +23,8 @@ Status Indicator), cause (Cause Name), delist_reason (Delisting Reason), doc_typ
 param_attain (Parameter Attainment), param_group (Parameter Group), param_name
 (Parameter Name), param_state_ir_code (Parameter State Integrated Report Code),
 param_status (Parameter Status), source_scale (Source Scale), source_type (Source
-Type), statecode (State), use_name (Use Name), use_support (Use Support), and
-water_type (Water Type).
+Type), statecode (State), use_name (Use Name), use_class (Use Class), use_support
+(Use Support), and water_type (Water Type).
 
 Default is NULL. When param = NULL, the df returned will list all domains for
 which an allowable list of values can be returned from ATTAINS web services.
diff --git a/vignettes/CybertownTraining.Rmd b/vignettes/CybertownTraining.Rmd
index 578aba2..5cbef0e 100644
--- a/vignettes/CybertownTraining.Rmd
+++ b/vignettes/CybertownTraining.Rmd
@@ -90,7 +90,7 @@ if (!"remotes" %in% installed.packages()) {
   install.packages("remotes")
 }
 
-remotes::install_github("USEPA/rExpertQuery", ref = "develop", dependencies = TRUE, force = TRUE)
+remotes::install_github("USEPA/rExpertQuery", ref = "add_useclasuse_domainvals", dependencies = TRUE, force = TRUE)
 
 library(rExpertQuery)
 ```