diff --git a/DESCRIPTION b/DESCRIPTION
index 42ac855e7..b6714de50 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: CohortDiagnostics
 Type: Package
 Title: Diagnostics for OHDSI Cohorts
-Version: 3.1.0
+Version: 3.1.1
 Date: 2022-07-20
 Authors@R: c(
     person("Gowtham", "Rao", email = "rao@ohdsi.org", role = c("aut", "cre")),
@@ -43,7 +43,6 @@ Suggests:
   CirceR,
   DT,
   Eunomia,
-  ggiraph,
   ggplot2,
   htmltools,
   knitr,
diff --git a/NAMESPACE b/NAMESPACE
index 39635a404..4cf26a2ae 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -10,7 +10,6 @@ export(getDataMigrator)
 export(getDefaultCovariateSettings)
 export(getDefaultVocabularyTableNames)
 export(getResultsDataModelSpecifications)
-export(launchCohortExplorer)
 export(launchDiagnosticsExplorer)
 export(migrateDataModel)
 export(runCohortRelationshipDiagnostics)
diff --git a/NEWS.md b/NEWS.md
index 608a15449..30681ca75 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,17 @@
+CohortDiagnostics 3.1.1
+=======================
+Changes:
+
+1. Removed CohortExplorer app as it's now part of a [new package](https://github.com/ohdsi/cohortExplorer).
+
+2. Added support for custom FeatureExtraction features
+
+Bug Fixes:
+
+1. Fixed error when checking for cdm_source table
+
+2. Removal of `.data$` usage across package to fix tidyselect warning
+
 CohortDiagnostics 3.1.0
 =======================
 Changes:
diff --git a/R/CohortCharacterizationDiagnostics.R b/R/CohortCharacterizationDiagnostics.R
index fb22e0a54..e55132e98 100644
--- a/R/CohortCharacterizationDiagnostics.R
+++ b/R/CohortCharacterizationDiagnostics.R
@@ -214,7 +214,7 @@ executeCohortCharacterization <- function(connection,
   startCohortCharacterization <- Sys.time()
   subset <- subsetToRequiredCohorts(
     cohorts = cohorts %>%
-      dplyr::filter(.data$cohortId %in% instantiatedCohorts),
+      dplyr::filter(cohortId %in% instantiatedCohorts),
     task = task,
     incremental = incremental,
     recordKeepingFile = recordKeepingFile
diff --git a/R/CohortRelationship.R b/R/CohortRelationship.R
index 24ec5207a..00d10af4c 100644
--- a/R/CohortRelationship.R
+++ b/R/CohortRelationship.R
@@ -85,7 +85,7 @@ runCohortRelationshipDiagnostics <-
 
     timePeriods <- relationshipDays %>%
       dplyr::distinct() %>%
-      dplyr::arrange(.data$startDay, .data$endDay) %>%
+      dplyr::arrange(startDay, endDay) %>%
       dplyr::mutate(timeId = dplyr::row_number())
 
     ParallelLogger::logTrace("   - Creating Andromeda object to collect results")
@@ -161,12 +161,12 @@ runCohortRelationshipDiagnostics <-
     resultsInAndromeda$cohortRelationships <-
       resultsInAndromeda$cohortRelationships %>%
       dplyr::inner_join(resultsInAndromeda$timePeriods, by = "timeId") %>%
-      dplyr::select(-.data$timeId) %>%
+      dplyr::select(-timeId) %>%
       dplyr::arrange(
-        .data$cohortId,
-        .data$comparatorCohortId,
-        .data$startDay,
-        .data$endDay
+        cohortId,
+        comparatorCohortId,
+        startDay,
+        endDay
       )
     resultsInAndromeda$timePeriods <- NULL
 
@@ -209,17 +209,17 @@ executeCohortRelationshipDiagnostics <- function(connection,
   startCohortRelationship <- Sys.time()
 
   allCohortIds <- cohortDefinitionSet %>%
-    dplyr::select(.data$cohortId, .data$checksum) %>%
-    dplyr::rename(targetCohortId = .data$cohortId,
-                  targetChecksum = .data$checksum) %>%
+    dplyr::select(cohortId, checksum) %>%
+    dplyr::rename(targetCohortId = cohortId,
+                  targetChecksum = checksum) %>%
     dplyr::distinct()
   combinationsOfPossibleCohortRelationships <- allCohortIds %>%
     tidyr::crossing(allCohortIds %>%
-                      dplyr::rename(comparatorCohortId = .data$targetCohortId,
-                                    comparatorChecksum = .data$targetChecksum)) %>%
-    dplyr::filter(.data$targetCohortId != .data$comparatorCohortId) %>%
-    dplyr::arrange(.data$targetCohortId, .data$comparatorCohortId) %>%
-    dplyr::mutate(checksum = paste0(.data$targetChecksum, .data$comparatorChecksum))
+                      dplyr::rename(comparatorCohortId = targetCohortId,
+                                    comparatorChecksum = targetChecksum)) %>%
+    dplyr::filter(targetCohortId != comparatorCohortId) %>%
+    dplyr::arrange(targetCohortId, comparatorCohortId) %>%
+    dplyr::mutate(checksum = paste0(targetChecksum, comparatorChecksum))
 
   subset <- subsetToRequiredCombis(
     combis = combinationsOfPossibleCohortRelationships,
@@ -243,7 +243,7 @@ executeCohortRelationshipDiagnostics <- function(connection,
         (nrow(combinationsOfPossibleCohortRelationships) - (
           nrow(
             combinationsOfPossibleCohortRelationships %>%
-            dplyr::filter(.data$targetCohortId %in% c(subset$targetCohortId))
+            dplyr::filter(targetCohortId %in% c(subset$targetCohortId))
           )
         )) > 0) {
       ParallelLogger::logInfo(
@@ -251,7 +251,7 @@ executeCohortRelationshipDiagnostics <- function(connection,
           " - Skipping %s combinations in incremental mode because these were previously computed.",
           nrow(combinationsOfPossibleCohortRelationships) - nrow(
             combinationsOfPossibleCohortRelationships %>%
-              dplyr::filter(.data$targetCohortId %in% c(subset$targetCohortId))
+              dplyr::filter(targetCohortId %in% c(subset$targetCohortId))
           )
         )
       )
diff --git a/R/ConceptSets.R b/R/ConceptSets.R
index 8924d3e85..10c42f91f 100644
--- a/R/ConceptSets.R
+++ b/R/ConceptSets.R
@@ -110,10 +110,10 @@ combineConceptSetsFromCohorts <- function(cohorts) {
   checkmate::reportAssertions(errorMessage)
   checkmate::assertDataFrame(
     x = cohorts %>% dplyr::select(
-      .data$cohortId,
-      .data$sql,
-      .data$json,
-      .data$cohortName
+      cohortId,
+      sql,
+      json,
+      cohortName
     ),
     any.missing = FALSE,
     min.cols = 4,
@@ -158,10 +158,10 @@ combineConceptSetsFromCohorts <- function(cohorts) {
     return(NULL)
   }
   conceptSets <- dplyr::bind_rows(conceptSets) %>%
-    dplyr::arrange(.data$cohortId, .data$conceptSetId)
+    dplyr::arrange(cohortId, conceptSetId)
 
   uniqueConceptSets <- conceptSets %>%
-    dplyr::select(.data$conceptSetExpression) %>%
+    dplyr::select(conceptSetExpression) %>%
     dplyr::distinct() %>%
     dplyr::mutate(uniqueConceptSetId = dplyr::row_number())
 
@@ -169,14 +169,14 @@ combineConceptSetsFromCohorts <- function(cohorts) {
     dplyr::inner_join(uniqueConceptSets, by = "conceptSetExpression") %>%
     dplyr::distinct() %>%
     dplyr::relocate(
-      .data$uniqueConceptSetId,
-      .data$cohortId,
-      .data$conceptSetId
+      uniqueConceptSetId,
+      cohortId,
+      conceptSetId
     ) %>%
     dplyr::arrange(
-      .data$uniqueConceptSetId,
-      .data$cohortId,
-      .data$conceptSetId
+      uniqueConceptSetId,
+      cohortId,
+      conceptSetId
     )
   return(conceptSets)
 }
@@ -371,7 +371,7 @@ runConceptSetDiagnostics <- function(connection,
   # Save concept set metadata ---------------------------------------
   conceptSetsExport <- makeDataExportable(
     x = conceptSets %>%
-      dplyr::select(-.data$uniqueConceptSetId) %>%
+      dplyr::select(-uniqueConceptSetId) %>%
       dplyr::distinct(),
     tableName = "concept_sets",
     minCellCount = minCellCount,
@@ -387,7 +387,7 @@ runConceptSetDiagnostics <- function(connection,
 
   uniqueConceptSets <-
     conceptSets[!duplicated(conceptSets$uniqueConceptSetId),] %>%
-      dplyr::select(-.data$cohortId, -.data$conceptSetId)
+      dplyr::select(-cohortId, -conceptSetId)
 
   timeExecution(
     exportFolder,
@@ -468,36 +468,36 @@ runConceptSetDiagnostics <- function(connection,
                 tidyr::tibble()
 
             counts <- counts %>%
-              dplyr::rename(uniqueConceptSetId = .data$conceptSetId) %>%
+              dplyr::rename(uniqueConceptSetId = conceptSetId) %>%
               dplyr::inner_join(
                 conceptSets %>% dplyr::select(
-                  .data$uniqueConceptSetId,
-                  .data$cohortId,
-                  .data$conceptSetId
+                  uniqueConceptSetId,
+                  cohortId,
+                  conceptSetId
                 ),
                 by = "uniqueConceptSetId"
               ) %>%
-              dplyr::select(-.data$uniqueConceptSetId) %>%
+              dplyr::select(-uniqueConceptSetId) %>%
               dplyr::mutate(databaseId = !!databaseId) %>%
               dplyr::relocate(
-                .data$databaseId,
-                .data$cohortId,
-                .data$conceptSetId,
-                .data$conceptId
+                databaseId,
+                cohortId,
+                conceptSetId,
+                conceptId
               ) %>%
               dplyr::distinct()
 
             counts <- counts %>%
               dplyr::group_by(
-                .data$databaseId,
-                .data$cohortId,
-                .data$conceptSetId,
-                .data$conceptId,
-                .data$sourceConceptId
+                databaseId,
+                cohortId,
+                conceptSetId,
+                conceptId,
+                sourceConceptId
               ) %>%
               dplyr::summarise(
-                conceptCount = max(.data$conceptCount),
-                conceptSubjects = max(.data$conceptSubjects)
+                conceptCount = max(conceptCount),
+                conceptSubjects = max(conceptSubjects)
               ) %>%
               dplyr::ungroup()
 
@@ -611,7 +611,7 @@ runConceptSetDiagnostics <- function(connection,
               )
               return(tidyr::tibble())
             }
-            primaryCodesetIds <- primaryCodesetIds %>% dplyr::filter(.data$domain %in%
+            primaryCodesetIds <- primaryCodesetIds %>% dplyr::filter(domain %in%
                                                                        c(domains$domain %>% unique()))
             if (nrow(primaryCodesetIds) == 0) {
               warning(
@@ -624,8 +624,8 @@ runConceptSetDiagnostics <- function(connection,
               return(tidyr::tibble())
             }
             primaryCodesetIds <- conceptSets %>%
-              dplyr::filter(.data$cohortId %in% cohort$cohortId) %>%
-              dplyr::select(codeSetIds = .data$conceptSetId, .data$uniqueConceptSetId) %>%
+              dplyr::filter(cohortId %in% cohort$cohortId) %>%
+              dplyr::select(codeSetIds = conceptSetId, uniqueConceptSetId) %>%
               dplyr::inner_join(primaryCodesetIds, by = "codeSetIds")
 
             pasteIds <- function(row) {
@@ -712,7 +712,7 @@ runConceptSetDiagnostics <- function(connection,
             counts <-
               lapply(split(primaryCodesetIds, 1:nrow(primaryCodesetIds)), getCounts) %>%
                 dplyr::bind_rows() %>%
-                dplyr::arrange(.data$conceptCount)
+                dplyr::arrange(conceptCount)
 
             if (nrow(counts) > 0) {
               counts$cohortId <- cohort$cohortId
@@ -849,32 +849,32 @@ runConceptSetDiagnostics <- function(connection,
       }
       data <- dplyr::bind_rows(data) %>%
         dplyr::distinct() %>%
-        dplyr::rename(uniqueConceptSetId = .data$codesetId) %>%
+        dplyr::rename(uniqueConceptSetId = codesetId) %>%
         dplyr::inner_join(
           conceptSets %>%
             dplyr::select(
-              .data$uniqueConceptSetId,
-              .data$cohortId,
-              .data$conceptSetId
+              uniqueConceptSetId,
+              cohortId,
+              conceptSetId
             ),
           by = "uniqueConceptSetId"
         ) %>%
-        dplyr::select(-.data$uniqueConceptSetId) %>%
+        dplyr::select(-uniqueConceptSetId) %>%
         dplyr::select(
-          .data$cohortId,
-          .data$conceptSetId,
-          .data$conceptId,
-          .data$conceptCount,
-          .data$conceptSubjects
+          cohortId,
+          conceptSetId,
+          conceptId,
+          conceptCount,
+          conceptSubjects
         ) %>%
         dplyr::group_by(
-          .data$cohortId,
-          .data$conceptSetId,
-          .data$conceptId
+          cohortId,
+          conceptSetId,
+          conceptId
         ) %>%
         dplyr::summarise(
-          conceptCount = max(.data$conceptCount),
-          conceptSubjects = max(.data$conceptSubjects)
+          conceptCount = max(conceptCount),
+          conceptSubjects = max(conceptSubjects)
         ) %>%
         dplyr::ungroup()
       data <- makeDataExportable(
@@ -941,14 +941,14 @@ runConceptSetDiagnostics <- function(connection,
       snakeCaseToCamelCase = TRUE
     ) %>%
       dplyr::tibble() %>%
-      dplyr::rename(uniqueConceptSetId = .data$codesetId) %>%
+      dplyr::rename(uniqueConceptSetId = codesetId) %>%
       dplyr::inner_join(conceptSets,
                         by = "uniqueConceptSetId"
       ) %>%
       dplyr::select(
-        .data$cohortId,
-        .data$conceptSetId,
-        .data$conceptId
+        cohortId,
+        conceptSetId,
+        conceptId
       )
 
   resolvedConceptIds <- makeDataExportable(
diff --git a/R/DataSourceInformation.R b/R/DataSourceInformation.R
index 6bd7d7c57..72f66db48 100644
--- a/R/DataSourceInformation.R
+++ b/R/DataSourceInformation.R
@@ -49,10 +49,13 @@ getCdmDataSourceInformation <-
       }
     }
 
-    if (!DatabaseConnector::dbExistsTable(conn = connection, name = "cdm_source")) {
+    if (!DatabaseConnector::existsTable(connection = connection,
+                                        databaseSchema = cdmDatabaseSchema,
+                                        tableName = "cdm_source")) {
       warning("CDM Source table not found in CDM. Metadata on CDM source will be limited.")
       return(NULL)
     }
+
     sqlCdmDataSource <-
       "select * from @cdm_database_schema.cdm_source;"
     cdmDataSource <-
diff --git a/R/ExportCharacterization.R b/R/ExportCharacterization.R
index cd772c2fb..ead0585b8 100644
--- a/R/ExportCharacterization.R
+++ b/R/ExportCharacterization.R
@@ -31,7 +31,7 @@ exportCharacterization <- function(characteristics,
   } else if (dplyr::pull(dplyr::count(characteristics$covariateRef)) > 0) {
     characteristics$filteredCovariates <-
       characteristics$covariates %>%
-      dplyr::filter(.data$mean >= minCharacterizationMean) %>%
+      dplyr::filter(mean >= minCharacterizationMean) %>%
       dplyr::mutate(databaseId = !!databaseId) %>%
       dplyr::left_join(counts,
         by = c("cohortId", "databaseId"),
@@ -39,22 +39,22 @@ exportCharacterization <- function(characteristics,
       ) %>%
       dplyr::mutate(
         mean = dplyr::if_else(
-          .data$mean != 0 & .data$mean < minCellCount / as.numeric(.data$cohortEntries),
-          -minCellCount / as.numeric(.data$cohortEntries),
-          .data$mean
+          mean != 0 & mean < minCellCount / as.numeric(cohortEntries),
+          -minCellCount / as.numeric(cohortEntries),
+          mean
         ),
         sumValue = dplyr::if_else(
-          .data$sumValue != 0 & .data$sumValue < minCellCount,
+          sumValue != 0 & sumValue < minCellCount,
           -minCellCount,
-          .data$sumValue
+          sumValue
         )
       ) %>%
-      dplyr::mutate(sd = dplyr::if_else(.data$mean >= 0, .data$sd, 0)) %>%
+      dplyr::mutate(sd = dplyr::if_else(mean >= 0, sd, 0)) %>%
       dplyr::mutate(
-        mean = round(.data$mean, digits = 4),
-        sd = round(.data$sd, digits = 4)
+        mean = round(mean, digits = 4),
+        sd = round(sd, digits = 4)
       ) %>%
-      dplyr::select(-.data$cohortEntries, -.data$cohortSubjects) %>%
+      dplyr::select(-cohortEntries, -cohortSubjects) %>%
       dplyr::distinct() %>% makeDataExportable(
         tableName = "temporal_covariate_value",
         minCellCount = minCellCount,
diff --git a/R/InclusionRules.R b/R/InclusionRules.R
index 6940c1868..21e08056e 100644
--- a/R/InclusionRules.R
+++ b/R/InclusionRules.R
@@ -27,7 +27,7 @@ getInclusionStats <- function(connection,
   ParallelLogger::logInfo("Fetching inclusion statistics from files")
   subset <- subsetToRequiredCohorts(
     cohorts = cohortDefinitionSet %>%
-      dplyr::filter(.data$cohortId %in% instantiatedCohorts),
+      dplyr::filter(cohortId %in% instantiatedCohorts),
     task = "runInclusionStatistics",
     incremental = incremental,
     recordKeepingFile = recordKeepingFile
diff --git a/R/MetaDataDiagnostics.R b/R/MetaDataDiagnostics.R
index afa82ccc9..9c9b29138 100644
--- a/R/MetaDataDiagnostics.R
+++ b/R/MetaDataDiagnostics.R
@@ -166,8 +166,8 @@ getVocabularyVersion <- function(connection, vocabularyDatabaseSchema) {
     snakeCaseToCamelCase = TRUE
   ) %>%
     dplyr::tibble() %>%
-    dplyr::rename(vocabularyVersion = .data$vocabularyVersion) %>%
-    dplyr::pull(.data$vocabularyVersion) %>%
+    dplyr::rename(vocabularyVersion = vocabularyVersion) %>%
+    dplyr::pull(vocabularyVersion) %>%
     unique()
 
   # Edge case where a CDM has more than a single entry
diff --git a/R/Private.R b/R/Private.R
index ef279e325..a1ed136e4 100644
--- a/R/Private.R
+++ b/R/Private.R
@@ -129,7 +129,7 @@ makeDataExportable <- function(x,
 
   if ("cohortDefinitionId" %in% colnames(x)) {
     x <- x %>%
-      dplyr::rename(cohortId = .data$cohortDefinitionId)
+      dplyr::rename(cohortId = cohortDefinitionId)
   }
 
   resultsDataModel <- getResultsDataModelSpecifications()
@@ -140,29 +140,29 @@ makeDataExportable <- function(x,
   }
 
   fieldsInDataModel <- resultsDataModel %>%
-    dplyr::filter(.data$tableName == !!tableName) %>%
-    dplyr::pull(.data$columnName) %>%
+    dplyr::filter(tableName == !!tableName) %>%
+    dplyr::pull(columnName) %>%
     SqlRender::snakeCaseToCamelCase() %>%
     unique()
 
   requiredFieldsInDataModel <- resultsDataModel %>%
-    dplyr::filter(.data$tableName == !!tableName) %>%
-    dplyr::filter(.data$isRequired == "Yes") %>%
-    dplyr::pull(.data$columnName) %>%
+    dplyr::filter(tableName == !!tableName) %>%
+    dplyr::filter(isRequired == "Yes") %>%
+    dplyr::pull(columnName) %>%
     SqlRender::snakeCaseToCamelCase() %>%
     unique()
 
   primaryKeyInDataModel <- resultsDataModel %>%
-    dplyr::filter(.data$tableName == !!tableName) %>%
-    dplyr::filter(.data$primaryKey == "Yes") %>%
-    dplyr::pull(.data$columnName) %>%
+    dplyr::filter(tableName == !!tableName) %>%
+    dplyr::filter(primaryKey == "Yes") %>%
+    dplyr::pull(columnName) %>%
     SqlRender::snakeCaseToCamelCase() %>%
     unique()
 
   columnsToApplyMinCellValue <- resultsDataModel %>%
-    dplyr::filter(.data$tableName == !!tableName) %>%
-    dplyr::filter(.data$minCellCount == "Yes") %>%
-    dplyr::pull(.data$columnName) %>%
+    dplyr::filter(tableName == !!tableName) %>%
+    dplyr::filter(minCellCount == "Yes") %>%
+    dplyr::pull(columnName) %>%
     SqlRender::snakeCaseToCamelCase() %>%
     unique()
 
diff --git a/R/ResultsDataModel.R b/R/ResultsDataModel.R
index 701ae8681..90b50118f 100644
--- a/R/ResultsDataModel.R
+++ b/R/ResultsDataModel.R
@@ -37,8 +37,8 @@ getResultsDataModelSpecifications <- function() {
 #' @export
 getDefaultVocabularyTableNames <- function() {
   getResultsDataModelSpecifications() %>%
-    dplyr::filter(.data$isVocabularyTable == "Yes") %>%
-    dplyr::pull(.data$tableName) %>%
+    dplyr::filter(isVocabularyTable == "Yes") %>%
+    dplyr::pull(tableName) %>%
     unique() %>%
     sort() %>%
     SqlRender::snakeCaseToCamelCase()
@@ -62,7 +62,7 @@ fixTableMetadataForBackwardCompatibility <- function(table, tableName) {
     }
     if ("referent_concept_id" %in% colnames(table)) {
       table <- table %>%
-        dplyr::select(-.data$referent_concept_id)
+        dplyr::select(-referent_concept_id)
     }
   }
   if (tableName %in% c("covariate_value", "temporal_covariate_value")) {
@@ -90,18 +90,18 @@ checkFixColumnNames <-
     observeredNames <- colnames(table)[order(colnames(table))]
 
     tableSpecs <- specifications %>%
-      dplyr::filter(.data$tableName == !!tableName)
+      dplyr::filter(tableName == !!tableName)
 
     optionalNames <- tableSpecs %>%
-      dplyr::filter(.data$optional == "Yes") %>%
-      dplyr::select(.data$columnName)
+      dplyr::filter(optional == "Yes") %>%
+      dplyr::select(columnName)
 
     expectedNames <- tableSpecs %>%
-      dplyr::select(.data$columnName) %>%
-      dplyr::anti_join(dplyr::filter(optionalNames, !.data$columnName %in% observeredNames),
+      dplyr::select(columnName) %>%
+      dplyr::anti_join(dplyr::filter(optionalNames, !columnName %in% observeredNames),
                        by = "columnName"
       ) %>%
-      dplyr::arrange(.data$columnName) %>%
+      dplyr::arrange(columnName) %>%
       dplyr::pull()
 
     if (!checkmate::testNames(observeredNames, must.include = expectedNames)) {
@@ -131,7 +131,7 @@ checkAndFixDataTypes <-
            zipFileName,
            specifications = getResultsDataModelSpecifications()) {
     tableSpecs <- specifications %>%
-      filter(.data$tableName == !!tableName)
+      filter(tableName == !!tableName)
 
     observedTypes <- sapply(table, class)
     for (i in 1:length(observedTypes)) {
@@ -205,9 +205,9 @@ checkAndFixDuplicateRows <-
            zipFileName,
            specifications = getResultsDataModelSpecifications()) {
     primaryKeys <- specifications %>%
-      dplyr::filter(.data$tableName == !!tableName &
-                      .data$primaryKey == "Yes") %>%
-      dplyr::select(.data$columnName) %>%
+      dplyr::filter(tableName == !!tableName &
+                      primaryKey == "Yes") %>%
+      dplyr::select(columnName) %>%
       dplyr::pull()
     duplicatedRows <- duplicated(table[, primaryKeys])
     if (any(duplicatedRows)) {
@@ -232,9 +232,9 @@ appendNewRows <-
            specifications = getResultsDataModelSpecifications()) {
     if (nrow(data) > 0) {
       primaryKeys <- specifications %>%
-        dplyr::filter(.data$tableName == !!tableName &
-                        .data$primaryKey == "Yes") %>%
-        dplyr::select(.data$columnName) %>%
+        dplyr::filter(tableName == !!tableName &
+                        primaryKey == "Yes") %>%
+        dplyr::select(columnName) %>%
         dplyr::pull()
       newData <- newData %>%
         dplyr::anti_join(data, by = primaryKeys)
@@ -359,9 +359,9 @@ uploadResults <- function(connectionDetails,
     ParallelLogger::logInfo("Uploading table ", tableName)
 
     primaryKey <- specifications %>%
-      filter(.data$tableName == !!tableName &
-               .data$primaryKey == "Yes") %>%
-      select(.data$columnName) %>%
+      filter(tableName == !!tableName &
+               primaryKey == "Yes") %>%
+      select(columnName) %>%
       pull()
 
     if (purgeSiteDataBeforeUploading &&
@@ -431,11 +431,11 @@ uploadResults <- function(connectionDetails,
         # Primary key fields cannot be NULL, so for some tables convert NAs to empty or zero:
         toEmpty <- specifications %>%
           filter(
-            .data$tableName == env$tableName &
-              .data$emptyIsNa == "No" &
-              grepl("varchar", .data$dataType)
+            tableName == env$tableName &
+              emptyIsNa == "No" &
+              grepl("varchar", dataType)
           ) %>%
-          select(.data$columnName) %>%
+          select(columnName) %>%
           pull()
         if (length(toEmpty) > 0) {
           chunk <- chunk %>%
@@ -444,11 +444,11 @@ uploadResults <- function(connectionDetails,
 
         tozero <- specifications %>%
           filter(
-            .data$tableName == env$tableName &
-              .data$emptyIsNa == "No" &
-              .data$dataType %in% c("int", "bigint", "float")
+            tableName == env$tableName &
+              emptyIsNa == "No" &
+              dataType %in% c("int", "bigint", "float")
           ) %>%
-          select(.data$columnName) %>%
+          select(columnName) %>%
           pull()
         if (length(tozero) > 0) {
           chunk <- chunk %>%
@@ -643,4 +643,4 @@ getDataMigrator <- function(connectionDetails, databaseSchema, tablePrefix = "")
                                                tablePrefix = tablePrefix,
                                                migrationPath = "migrations",
                                                packageName = utils::packageName())
-}
\ No newline at end of file
+}
diff --git a/R/RunDiagnostics.R b/R/RunDiagnostics.R
index cd00973f3..c2e2b1236 100644
--- a/R/RunDiagnostics.R
+++ b/R/RunDiagnostics.R
@@ -211,21 +211,21 @@ executeDiagnostics <- function(cohortDefinitionSet,
                                incremental = FALSE,
                                incrementalFolder = file.path(exportFolder, "incremental")) {
   # collect arguments that were passed to cohort diagnostics at initiation
-  argumentsAtDiagnosticsInitiation <- formals(executeDiagnostics)
-  argumentsAtDiagnosticsInitiationJson <-
+  callingArgs <- formals(executeDiagnostics)
+  callingArgsJson <-
     list(
-      runInclusionStatistics = argumentsAtDiagnosticsInitiation$runInclusionStatistics,
-      runIncludedSourceConcepts = argumentsAtDiagnosticsInitiation$runIncludedSourceConcepts,
-      runOrphanConcepts = argumentsAtDiagnosticsInitiation$runOrphanConcepts,
-      runTimeSeries = argumentsAtDiagnosticsInitiation$runTimeSeries,
-      runVisitContext = argumentsAtDiagnosticsInitiation$runVisitContext,
-      runBreakdownIndexEvents = argumentsAtDiagnosticsInitiation$runBreakdownIndexEvents,
-      runIncidenceRate = argumentsAtDiagnosticsInitiation$runIncidenceRate,
-      runTemporalCohortCharacterization = argumentsAtDiagnosticsInitiation$runTemporalCohortCharacterization,
-      minCellCount = argumentsAtDiagnosticsInitiation$minCellCount,
-      minCharacterizationMean = argumentsAtDiagnosticsInitiation$minCharacterizationMean,
-      incremental = argumentsAtDiagnosticsInitiation$incremental,
-      temporalCovariateSettings = argumentsAtDiagnosticsInitiation$temporalCovariateSettings
+      runInclusionStatistics = callingArgs$runInclusionStatistics,
+      runIncludedSourceConcepts = callingArgs$runIncludedSourceConcepts,
+      runOrphanConcepts = callingArgs$runOrphanConcepts,
+      runTimeSeries = callingArgs$runTimeSeries,
+      runVisitContext = callingArgs$runVisitContext,
+      runBreakdownIndexEvents = callingArgs$runBreakdownIndexEvents,
+      runIncidenceRate = callingArgs$runIncidenceRate,
+      runTemporalCohortCharacterization = callingArgs$runTemporalCohortCharacterization,
+      minCellCount = callingArgs$minCellCount,
+      minCharacterizationMean = callingArgs$minCharacterizationMean,
+      incremental = callingArgs$incremental,
+      temporalCovariateSettings = callingArgs$temporalCovariateSettings
     ) %>%
       RJSONIO::toJSON(digits = 23, pretty = TRUE)
 
@@ -356,18 +356,44 @@ executeDiagnostics <- function(cohortDefinitionSet,
       )
   }
   if (runTemporalCohortCharacterization) {
-    checkmate::assert_class(x = temporalCovariateSettings,
-                            classes = c("covariateSettings"))
+    if (class(temporalCovariateSettings) == "covariateSettings") {
+      temporalCovariateSettings <- list(temporalCovariateSettings)
+    }
+    # All temporal covariate settings objects must be covariateSettings
+    checkmate::assert_true(all(lapply(temporalCovariateSettings, class) == c("covariateSettings")), add = errorMessage)
+
+    requiredCharacterisationSettings <- c("DemographicsGender", "DemographicsAgeGroup", "DemographicsRace",
+                                          "DemographicsEthnicity", "DemographicsIndexYear", "DemographicsIndexMonth",
+                                          "ConditionEraGroupOverlap", "DrugEraGroupOverlap", "CharlsonIndex",
+                                          "Chads2", "Chads2Vasc")
+    presentSettings <- temporalCovariateSettings[[1]][requiredCharacterisationSettings]
+    if (!all(unlist(presentSettings))) {
+      warning(
+        "For cohort charcterization to display standardized results the following covariates must be present in your temporalCovariateSettings: \n\n",
+        paste(requiredCharacterisationSettings, collapse = ", "))
+    }
+
+    requiredTimeDistributionSettings <- c("DemographicsPriorObservationTime",
+                                          "DemographicsPostObservationTime",
+                                          "DemographicsTimeInCohort")
+
+    presentSettings <- temporalCovariateSettings[[1]][requiredTimeDistributionSettings]
+    if (!all(unlist(presentSettings))) {
+      warning(
+        "For time distributions diagnostics to display standardized results the following covariates must be present in your temporalCovariateSettings: \n\n",
+        paste(requiredTimeDistributionSettings, collapse = ", "))
+    }
+
     # forcefully set ConditionEraGroupStart and drugEraGroupStart to NULL
     # because of known bug in FeatureExtraction. https://github.com/OHDSI/FeatureExtraction/issues/144
-    temporalCovariateSettings$ConditionEraGroupStart <- NULL
-    temporalCovariateSettings$DrugEraGroupStart <- NULL
+    temporalCovariateSettings[[1]]$ConditionEraGroupStart <- NULL
+    temporalCovariateSettings[[1]]$DrugEraGroupStart <- NULL
 
-    checkmate::assert_integerish(x = temporalCovariateSettings$temporalStartDays,
+    checkmate::assert_integerish(x = temporalCovariateSettings[[1]]$temporalStartDays,
                                  any.missing = FALSE,
                                  min.len = 1,
                                  add = errorMessage)
-    checkmate::assert_integerish(x = temporalCovariateSettings$temporalEndDays,
+    checkmate::assert_integerish(x = temporalCovariateSettings[[1]]$temporalEndDays,
                                  any.missing = FALSE,
                                  min.len = 1,
                                  add = errorMessage)
@@ -385,10 +411,10 @@ executeDiagnostics <- function(cohortDefinitionSet,
            c(-9999, 9999))
     for (p1 in requiredTemporalPairs) {
       found <- FALSE
-      for (i in 1:length(temporalCovariateSettings$temporalStartDays)) {
+      for (i in 1:length(temporalCovariateSettings[[1]]$temporalStartDays)) {
         p2 <- c(
-          temporalCovariateSettings$temporalStartDays[i],
-          temporalCovariateSettings$temporalEndDays[i]
+          temporalCovariateSettings[[1]]$temporalStartDays[i],
+          temporalCovariateSettings[[1]]$temporalEndDays[i]
         )
 
         if (p2[1] == p1[1] & p2[2] == p1[2]) {
@@ -398,39 +424,14 @@ executeDiagnostics <- function(cohortDefinitionSet,
       }
 
       if (!found) {
-        temporalCovariateSettings$temporalStartDays <-
-          c(temporalCovariateSettings$temporalStartDays, p1[1])
-        temporalCovariateSettings$temporalEndDays <-
-          c(temporalCovariateSettings$temporalEndDays, p1[2])
+        temporalCovariateSettings[[1]]$temporalStartDays <-
+          c(temporalCovariateSettings[[1]]$temporalStartDays, p1[1])
+        temporalCovariateSettings[[1]]$temporalEndDays <-
+          c(temporalCovariateSettings[[1]]$temporalEndDays, p1[2])
       }
     }
   }
 
-  if (runTemporalCohortCharacterization) {
-    requiredCharacterisationSettings <- c("DemographicsGender", "DemographicsAgeGroup", "DemographicsRace",
-                                          "DemographicsEthnicity", "DemographicsIndexYear", "DemographicsIndexMonth",
-                                          "ConditionEraGroupOverlap", "DrugEraGroupOverlap", "CharlsonIndex",
-                                          "Chads2", "Chads2Vasc")
-
-    presentSettings <- temporalCovariateSettings[requiredCharacterisationSettings]
-    if (!all(unlist(presentSettings))) {
-      warning(
-        "For cohort charcterization to display standardized results the following covariates must be present in your temporalCovariateSettings: \n\n",
-        paste(requiredCharacterisationSettings, collapse = ", "))
-    }
-
-    requiredTimeDistributionSettings <- c("DemographicsPriorObservationTime",
-                                          "DemographicsPostObservationTime",
-                                          "DemographicsTimeInCohort")
-
-    presentSettings <- temporalCovariateSettings[requiredTimeDistributionSettings]
-    if (!all(unlist(presentSettings))) {
-      warning(
-        "For time distributions diagnostics to display standardized results the following covariates must be present in your temporalCovariateSettings: \n\n",
-        paste(requiredTimeDistributionSettings, collapse = ", "))
-    }
-  }
-
   checkmate::reportAssertions(collection = errorMessage)
   if (!is.null(cohortIds)) {
     cohortDefinitionSet <- cohortDefinitionSet %>% dplyr::filter(cohortId %in% cohortIds)
@@ -443,15 +444,15 @@ executeDiagnostics <- function(cohortDefinitionSet,
     sort()
   cohortTableColumnNamesExpected <-
     getResultsDataModelSpecifications() %>%
-      dplyr::filter(.data$tableName == "cohort") %>%
-      dplyr::pull(.data$columnName) %>%
+      dplyr::filter(tableName == "cohort") %>%
+      dplyr::pull(columnName) %>%
       SqlRender::snakeCaseToCamelCase() %>%
       sort()
   cohortTableColumnNamesRequired <-
     getResultsDataModelSpecifications() %>%
-      dplyr::filter(.data$tableName == "cohort") %>%
-      dplyr::filter(.data$isRequired == "Yes") %>%
-      dplyr::pull(.data$columnName) %>%
+      dplyr::filter(tableName == "cohort") %>%
+      dplyr::filter(isRequired == "Yes") %>%
+      dplyr::pull(columnName) %>%
       SqlRender::snakeCaseToCamelCase() %>%
       sort()
 
@@ -603,8 +604,8 @@ executeDiagnostics <- function(cohortDefinitionSet,
 
   if (nrow(cohortCounts) > 0) {
     instantiatedCohorts <- cohortCounts %>%
-      dplyr::filter(.data$cohortEntries > 0) %>%
-      dplyr::pull(.data$cohortId)
+      dplyr::filter(cohortEntries > 0) %>%
+      dplyr::pull(cohortId)
     ParallelLogger::logInfo(
       sprintf(
         "Found %s of %s (%1.2f%%) submitted cohorts instantiated. ",
@@ -771,7 +772,7 @@ executeDiagnostics <- function(cohortDefinitionSet,
           tempEmulationSchema = tempEmulationSchema,
           cohortTable = cohortTable,
           cohortDefinitionSet = cohortDefinitionSet,
-          temporalCovariateSettings = temporalCovariateSettings,
+          temporalCovariateSettings = temporalCovariateSettings[[1]],
           minCellCount = minCellCount,
           recordKeepingFile = recordKeepingFile,
           incremental = incremental
@@ -926,7 +927,7 @@ executeDiagnostics <- function(cohortDefinitionSet,
     # 3
     packageDependencySnapShotJson,
     # 4
-    argumentsAtDiagnosticsInitiationJson,
+    callingArgsJson,
     # 5
     as.character(R.Version()$version.string),
     # 6
diff --git a/R/Shiny.R b/R/Shiny.R
index cce7b2874..fa4031824 100644
--- a/R/Shiny.R
+++ b/R/Shiny.R
@@ -136,6 +136,7 @@ launchDiagnosticsExplorer <- function(sqliteDbPath = "MergedCohortDiagnosticsDat
                      "markdownInput",
                      "markdown",
                      "jsonlite",
+                     "ggh4x",
                      "yaml"))
 
   appDir <-
@@ -254,54 +255,6 @@ createDiagnosticsExplorerZip <- function(outputZipfile = file.path(getwd(), "Dia
   DatabaseConnector::createZipFile(outputZipfile, file.path(tmpDir, "DiagnosticsExplorer"), rootFolder = tmpDir)
 }
 
-
-#' Launch the CohortExplorer Shiny app
-#'
-#' @template CohortTable
-#'
-#' @template CdmDatabaseSchema
-#'
-#' @param connectionDetails    An object of type \code{connectionDetails} as created using the
-#'                             \code{\link[DatabaseConnector]{createConnectionDetails}} function in the
-#'                             DatabaseConnector package.
-#' @param cohortId             The ID of the cohort.
-#' @param sampleSize           Number of subjects to sample from the cohort. Ignored if subjectIds is specified.
-#' @param subjectIds           A vector of subject IDs to view.
-#'
-#' @details
-#' Launches a Shiny app that allows the user to explore a cohort of interest.
-#'
-#' @export
-launchCohortExplorer <- function(connectionDetails,
-                                 cdmDatabaseSchema,
-                                 cohortDatabaseSchema,
-                                 cohortTable,
-                                 cohortId,
-                                 sampleSize = 100,
-                                 subjectIds = NULL) {
-  ensure_installed(c("shiny",
-                     "DT",
-                     "plotly",
-                     "RColorBrewer",
-                     "ggplot2",
-                     "magrittr"))
-
-  .GlobalEnv$shinySettings <-
-    list(
-      connectionDetails = connectionDetails,
-      cdmDatabaseSchema = cdmDatabaseSchema,
-      cohortDatabaseSchema = cohortDatabaseSchema,
-      cohortTable = cohortTable,
-      cohortDefinitionId = cohortId,
-      sampleSize = sampleSize,
-      subjectIds = subjectIds
-    )
-  on.exit(rm("shinySettings", envir = .GlobalEnv))
-  appDir <-
-    system.file("shiny", "CohortExplorer", package = utils::packageName())
-  shiny::runApp(appDir)
-}
-
 ensure_installed <- function(pkgs) {
   notInstalled <- pkgs[!(pkgs %in% rownames(installed.packages()))]
 
diff --git a/R/TimeSeries.R b/R/TimeSeries.R
index 598f54c80..f35c23e33 100644
--- a/R/TimeSeries.R
+++ b/R/TimeSeries.R
@@ -98,7 +98,7 @@ runCohortTimeSeriesDiagnostics <- function(connectionDetails = NULL,
     )
     if (resultsInAndromeda$cohortCount %>%
       dplyr::summarise(n = dplyr::n()) %>%
-      dplyr::pull(.data$n) == 0) {
+      dplyr::pull(n) == 0) {
       warning("Please check if cohorts are instantiated. Exiting cohort time series.")
       return(NULL)
     }
@@ -124,7 +124,7 @@ runCohortTimeSeriesDiagnostics <- function(connectionDetails = NULL,
         by = clock::duration_months(3)
       )
     ) %>%
-      dplyr::mutate(periodEnd = clock::add_months(x = .data$periodBegin, n = 3) - 1) %>%
+      dplyr::mutate(periodEnd = clock::add_months(x = periodBegin, n = 3) - 1) %>%
       dplyr::mutate(calendarInterval = "q")
 
   calendarMonth <-
@@ -135,7 +135,7 @@ runCohortTimeSeriesDiagnostics <- function(connectionDetails = NULL,
         by = clock::duration_months(1)
       )
     ) %>%
-      dplyr::mutate(periodEnd = clock::add_months(x = .data$periodBegin, n = 1) - 1) %>%
+      dplyr::mutate(periodEnd = clock::add_months(x = periodBegin, n = 1) - 1) %>%
       dplyr::mutate(calendarInterval = "m")
 
   calendarYear <-
@@ -146,7 +146,7 @@ runCohortTimeSeriesDiagnostics <- function(connectionDetails = NULL,
         by = clock::duration_years(1)
       )
     ) %>%
-      dplyr::mutate(periodEnd = clock::add_years(x = .data$periodBegin, n = 1) - 1) %>%
+      dplyr::mutate(periodEnd = clock::add_years(x = periodBegin, n = 1) - 1) %>%
       dplyr::mutate(calendarInterval = "y")
 
   timeSeriesDateRange <- dplyr::tibble(
@@ -163,7 +163,7 @@ runCohortTimeSeriesDiagnostics <- function(connectionDetails = NULL,
       timeSeriesDateRange
     ) %>% # calendarWeek
       dplyr::distinct() %>%
-      dplyr::arrange(.data$periodBegin, .data$periodEnd, .data$calendarInterval) %>%
+      dplyr::arrange(periodBegin, periodEnd, calendarInterval) %>%
       dplyr::mutate(timeId = dplyr::row_number())
 
   ParallelLogger::logTrace(" - Inserting calendar periods")
@@ -455,17 +455,17 @@ runCohortTimeSeriesDiagnostics <- function(connectionDetails = NULL,
                       by = c("timeId")
     ) %>%
     dplyr::arrange(
-      .data$cohortId,
-      .data$periodBegin,
-      .data$calendarInterval,
-      .data$seriesType,
-      .data$periodBegin
+      cohortId,
+      periodBegin,
+      calendarInterval,
+      seriesType,
+      periodBegin
     ) %>%
-    dplyr::select(-.data$timeId) %>%
+    dplyr::select(-timeId) %>%
     dplyr::mutate(ageGroup = dplyr::if_else(
-      condition = is.na(.data$ageGroup),
-      true = as.character(.data$ageGroup),
-      false = paste(10 * .data$ageGroup, 10 * .data$ageGroup + 9, sep = "-")
+      condition = is.na(ageGroup),
+      true = as.character(ageGroup),
+      false = paste(10 * ageGroup, 10 * ageGroup + 9, sep = "-")
     ))
 
   resultsInAndromeda$calendarPeriods <- NULL
@@ -530,12 +530,12 @@ executeTimeSeriesDiagnostics <- function(connection,
   if (runCohortTimeSeries & nrow(cohortDefinitionSet) > 0) {
     subset <- subsetToRequiredCohorts(
       cohorts = cohortDefinitionSet %>%
-        dplyr::filter(.data$cohortId %in% instantiatedCohorts),
+        dplyr::filter(cohortId %in% instantiatedCohorts),
       task = "runCohortTimeSeries",
       incremental = incremental,
       recordKeepingFile = recordKeepingFile
     ) %>%
-      dplyr::arrange(.data$cohortId)
+      dplyr::arrange(cohortId)
 
     if (nrow(subset) > 0) {
       if (incremental &&
diff --git a/R/VisitContext.R b/R/VisitContext.R
index f9910c9a1..dcd90c0a2 100644
--- a/R/VisitContext.R
+++ b/R/VisitContext.R
@@ -107,7 +107,7 @@ executeVisitContextDiagnostics <- function(connection,
   ParallelLogger::logInfo("Retrieving visit context for index dates")
   subset <- subsetToRequiredCohorts(
     cohorts = cohorts %>%
-      dplyr::filter(.data$cohortId %in% instantiatedCohorts),
+      dplyr::filter(cohortId %in% instantiatedCohorts),
     task = "runVisitContext",
     incremental = incremental,
     recordKeepingFile = recordKeepingFile
diff --git a/docs/404.html b/docs/404.html
index 4dea5205a..653fa5c34 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -32,7 +32,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/articles/CreatingAStudyPackage.html b/docs/articles/CreatingAStudyPackage.html
index 1f751c868..d7205370b 100644
--- a/docs/articles/CreatingAStudyPackage.html
+++ b/docs/articles/CreatingAStudyPackage.html
@@ -33,7 +33,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
@@ -97,7 +97,7 @@ <h1 data-toc-skip>Creating a study package</h1>
                         <h4 data-toc-skip class="author">Gowtham A.
 Rao</h4>
             
-            <h4 data-toc-skip class="date">2022-10-12</h4>
+            <h4 data-toc-skip class="date">2022-12-06</h4>
       
       <small class="dont-index">Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/vignettes/CreatingAStudyPackage.Rmd" class="external-link"><code>vignettes/CreatingAStudyPackage.Rmd</code></a></small>
       <div class="hidden name"><code>CreatingAStudyPackage.Rmd</code></div>
diff --git a/docs/articles/DatabaseModeInDiagnosticsExplorer.html b/docs/articles/DatabaseModeInDiagnosticsExplorer.html
index 0ac30e8d2..c0e4afcb6 100644
--- a/docs/articles/DatabaseModeInDiagnosticsExplorer.html
+++ b/docs/articles/DatabaseModeInDiagnosticsExplorer.html
@@ -33,7 +33,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
@@ -97,7 +97,7 @@ <h1 data-toc-skip>Database mode in Diagnostics Explorer</h1>
                         <h4 data-toc-skip class="author">Gowtham
 Rao</h4>
             
-            <h4 data-toc-skip class="date">2022-10-12</h4>
+            <h4 data-toc-skip class="date">2022-12-06</h4>
       
       <small class="dont-index">Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/vignettes/DatabaseModeInDiagnosticsExplorer.Rmd" class="external-link"><code>vignettes/DatabaseModeInDiagnosticsExplorer.Rmd</code></a></small>
       <div class="hidden name"><code>DatabaseModeInDiagnosticsExplorer.Rmd</code></div>
diff --git a/docs/articles/RunningCohortDiagnostics.html b/docs/articles/RunningCohortDiagnostics.html
index 1937caa4f..19b970613 100644
--- a/docs/articles/RunningCohortDiagnostics.html
+++ b/docs/articles/RunningCohortDiagnostics.html
@@ -33,7 +33,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
@@ -97,7 +97,7 @@ <h1 data-toc-skip>Running Cohort Diagnostics</h1>
                         <h4 data-toc-skip class="author">Gowtham Rao and
 James P. Gilbert</h4>
             
-            <h4 data-toc-skip class="date">2022-10-12</h4>
+            <h4 data-toc-skip class="date">2022-12-06</h4>
       
       <small class="dont-index">Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/vignettes/RunningCohortDiagnostics.Rmd" class="external-link"><code>vignettes/RunningCohortDiagnostics.Rmd</code></a></small>
       <div class="hidden name"><code>RunningCohortDiagnostics.Rmd</code></div>
diff --git a/docs/articles/ViewingResultsUsingDiagnosticsExplorer.html b/docs/articles/ViewingResultsUsingDiagnosticsExplorer.html
index 555a07e39..50bf23ffe 100644
--- a/docs/articles/ViewingResultsUsingDiagnosticsExplorer.html
+++ b/docs/articles/ViewingResultsUsingDiagnosticsExplorer.html
@@ -33,7 +33,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
@@ -97,7 +97,7 @@ <h1 data-toc-skip>Viewing results using Diagnostics Explorer</h1>
                         <h4 data-toc-skip class="author">Gowtham
 Rao</h4>
             
-            <h4 data-toc-skip class="date">2022-10-12</h4>
+            <h4 data-toc-skip class="date">2022-12-06</h4>
       
       <small class="dont-index">Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/vignettes/ViewingResultsUsingDiagnosticsExplorer.Rmd" class="external-link"><code>vignettes/ViewingResultsUsingDiagnosticsExplorer.Rmd</code></a></small>
       <div class="hidden name"><code>ViewingResultsUsingDiagnosticsExplorer.Rmd</code></div>
diff --git a/docs/articles/WhatIsCohortDiagnostics.html b/docs/articles/WhatIsCohortDiagnostics.html
index a7a73b533..2e10d13f1 100644
--- a/docs/articles/WhatIsCohortDiagnostics.html
+++ b/docs/articles/WhatIsCohortDiagnostics.html
@@ -33,7 +33,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
@@ -97,7 +97,7 @@ <h1 data-toc-skip>What is Cohort Diagnostics?</h1>
                         <h4 data-toc-skip class="author">Gowtham
 Rao</h4>
             
-            <h4 data-toc-skip class="date">2022-10-12</h4>
+            <h4 data-toc-skip class="date">2022-12-06</h4>
       
       <small class="dont-index">Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/vignettes/WhatIsCohortDiagnostics.Rmd" class="external-link"><code>vignettes/WhatIsCohortDiagnostics.Rmd</code></a></small>
       <div class="hidden name"><code>WhatIsCohortDiagnostics.Rmd</code></div>
diff --git a/docs/articles/index.html b/docs/articles/index.html
index 67b99c042..561bf2513 100644
--- a/docs/articles/index.html
+++ b/docs/articles/index.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/authors.html b/docs/authors.html
index cc76bc794..7d9c1e724 100644
--- a/docs/authors.html
+++ b/docs/authors.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/index.html b/docs/index.html
index 9c261ac33..2bb5d9bcd 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -39,7 +39,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/news/index.html b/docs/news/index.html
index cb5562f3b..a6b61a274 100644
--- a/docs/news/index.html
+++ b/docs/news/index.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
@@ -72,6 +72,15 @@ <h1 data-toc-skip>Changelog <small></small></h1>
       <small>Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/NEWS.md" class="external-link"><code>NEWS.md</code></a></small>
     </div>
 
+    <div class="section level2">
+<h2 class="page-header" data-toc-text="3.1.1" id="cohortdiagnostics-311">CohortDiagnostics 3.1.1<a class="anchor" aria-label="anchor" href="#cohortdiagnostics-311"></a></h2>
+<p>Changes:</p>
+<ol style="list-style-type: decimal"><li><p>Removed CohortExplorer app as it’s now part of a <a href="https://github.com/ohdsi/cohortExplorer" class="external-link">new package</a>.</p></li>
+<li><p>Added support for custom FeatureExtraction features</p></li>
+</ol><p>Bug Fixes:</p>
+<ol style="list-style-type: decimal"><li><p>Fixed error when checking for cdm_source table</p></li>
+<li><p>Removal of <code>.data$</code> usage across package to fix tidyselect warning</p></li>
+</ol></div>
     <div class="section level2">
 <h2 class="page-header" data-toc-text="3.1.0" id="cohortdiagnostics-310">CohortDiagnostics 3.1.0<a class="anchor" aria-label="anchor" href="#cohortdiagnostics-310"></a></h2>
 <p>Changes:</p>
@@ -82,6 +91,7 @@ <h2 class="page-header" data-toc-text="3.1.0" id="cohortdiagnostics-310">CohortD
 <li><p>Added yaml configuration for diagnostics explorer app, including docs on usage</p></li>
 <li><p>Storage of version number in database results file to allow future migrations</p></li>
 <li><p>Slight optimization of cohort characterization queries in diagnostics explorer</p></li>
+<li><p>Support for database migrations by adding <code>migrateDataModel</code> functionality. Versions of data generated with CohortDiagnostics 3.0.0 are intended to be future compatible. i.e. if you have an sqlite results file or postgres database generated with version 3.0.0 of cohort diagnostics new shiny app functionality will be supported if you run <code>migrateDataModel</code> on it.</p></li>
 <li><p>Changed type to dataType and fieldName to columnName to align with strategus modules</p></li>
 <li><p>Refactored export of characterization results to use common export</p></li>
 <li><p>Ensure that tests cases always use a continuous covariate</p></li>
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
index ce053d56a..227a7fe6e 100644
--- a/docs/pkgdown.yml
+++ b/docs/pkgdown.yml
@@ -7,5 +7,5 @@ articles:
   RunningCohortDiagnostics: RunningCohortDiagnostics.html
   ViewingResultsUsingDiagnosticsExplorer: ViewingResultsUsingDiagnosticsExplorer.html
   WhatIsCohortDiagnostics: WhatIsCohortDiagnostics.html
-last_built: 2022-10-12T16:29Z
+last_built: 2022-12-06T21:26Z
 
diff --git a/docs/reference/CohortDiagnostics-package.html b/docs/reference/CohortDiagnostics-package.html
index 492888cb7..117984ced 100644
--- a/docs/reference/CohortDiagnostics-package.html
+++ b/docs/reference/CohortDiagnostics-package.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/checkInputFileEncoding.html b/docs/reference/checkInputFileEncoding.html
index 98e0aeac4..188894a1a 100644
--- a/docs/reference/checkInputFileEncoding.html
+++ b/docs/reference/checkInputFileEncoding.html
@@ -18,7 +18,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/createDiagnosticsExplorerZip.html b/docs/reference/createDiagnosticsExplorerZip.html
index 78b01340a..c86032d9d 100644
--- a/docs/reference/createDiagnosticsExplorerZip.html
+++ b/docs/reference/createDiagnosticsExplorerZip.html
@@ -20,7 +20,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/createMergedResultsFile.html b/docs/reference/createMergedResultsFile.html
index 1743dcec3..986542882 100644
--- a/docs/reference/createMergedResultsFile.html
+++ b/docs/reference/createMergedResultsFile.html
@@ -19,7 +19,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/createResultsDataModel.html b/docs/reference/createResultsDataModel.html
index d5a6c02b4..bd171264b 100644
--- a/docs/reference/createResultsDataModel.html
+++ b/docs/reference/createResultsDataModel.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
@@ -79,31 +79,19 @@ <h1>Create the results data model tables on a database server.</h1>
 
     <div id="ref-usage">
     <div class="sourceCode"><pre class="sourceCode r"><code><span><span class="fu">createResultsDataModel</span><span class="op">(</span></span>
-<span>  connection <span class="op">=</span> <span class="cn">NULL</span>,</span>
 <span>  connectionDetails <span class="op">=</span> <span class="cn">NULL</span>,</span>
-<span>  <span class="va">schema</span>,</span>
+<span>  <span class="va">databaseSchema</span>,</span>
 <span>  tablePrefix <span class="op">=</span> <span class="st">""</span></span>
 <span><span class="op">)</span></span></code></pre></div>
     </div>
 
     <div id="arguments">
     <h2>Arguments</h2>
-    <dl><dt>connection</dt>
-<dd><p>An object of type <code>connection</code> as created using the
-<code><a href="https://ohdsi.github.io/DatabaseConnector/reference/connect.html" class="external-link">connect</a></code> function in the
-DatabaseConnector package. Can be left NULL if <code>connectionDetails</code>
-is provided, in which case a new connection will be opened at the start
-of the function, and closed when the function finishes.</p></dd>
+    <dl><dt>connectionDetails</dt>
+<dd><p>DatabaseConnector connectionDetails instance @seealso[DatabaseConnector::createConnectionDetails]</p></dd>
 
 
-<dt>connectionDetails</dt>
-<dd><p>An object of type <code>connectionDetails</code> as created using the
-<code><a href="https://ohdsi.github.io/DatabaseConnector/reference/createConnectionDetails.html" class="external-link">createConnectionDetails</a></code> function in the
-DatabaseConnector package. Can be left NULL if <code>connection</code> is
-provided.</p></dd>
-
-
-<dt>schema</dt>
+<dt>databaseSchema</dt>
 <dd><p>The schema on the postgres server where the tables will be created.</p></dd>
 
 
diff --git a/docs/reference/executeDiagnostics.html b/docs/reference/executeDiagnostics.html
index f5a1b3da6..5da955790 100644
--- a/docs/reference/executeDiagnostics.html
+++ b/docs/reference/executeDiagnostics.html
@@ -22,7 +22,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/getCdmDataSourceInformation.html b/docs/reference/getCdmDataSourceInformation.html
index d8d12aac4..e90a48a1a 100644
--- a/docs/reference/getCdmDataSourceInformation.html
+++ b/docs/reference/getCdmDataSourceInformation.html
@@ -18,7 +18,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/getCohortCounts.html b/docs/reference/getCohortCounts.html
index 6c9799fa8..cae29104e 100644
--- a/docs/reference/getCohortCounts.html
+++ b/docs/reference/getCohortCounts.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/getDataMigrator.html b/docs/reference/getDataMigrator.html
new file mode 100644
index 000000000..eb9ed6fb4
--- /dev/null
+++ b/docs/reference/getDataMigrator.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<!-- Generated by pkgdown: do not edit by hand --><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Get database migrations instance — getDataMigrator • CohortDiagnostics</title><!-- jquery --><script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.4.0/cosmo/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha256-nuL8/2cJ5NDSSwnKD8VqreErSWHtnEP9E7AySL+1ev4=" crossorigin="anonymous"></script><!-- bootstrap-toc --><link rel="stylesheet" href="../bootstrap-toc.css"><script src="../bootstrap-toc.js"></script><!-- Font Awesome icons --><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css" integrity="sha256-mmgLkCYLUQbXn0B1SRqzHar6dCnv9oZFPEC1g1cwlkk=" crossorigin="anonymous"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/v4-shims.min.css" integrity="sha256-wZjR52fzng1pJHwx4aV2AO3yyTOXrcDW7jBpJtTwVxw=" crossorigin="anonymous"><!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js" integrity="sha256-inc5kl9MA1hkeYUt+EC3BhlIgyp/2jDIyBLS6k3UxPI=" crossorigin="anonymous"></script><!-- headroom.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/headroom.min.js" integrity="sha256-AsUX4SJE1+yuDu5+mAVzJbuYNPHj/WroHuZ8Ir/CkE0=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/jQuery.headroom.min.js" integrity="sha256-ZX/yNShbjqsohH1k95liqY9Gd8uOiE1S4vZc+9KQ1K4=" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"><script src="../pkgdown.js"></script><meta property="og:title" content="Get database migrations instance — getDataMigrator"><meta property="og:description" content="Returns ResultModelManager DataMigrationsManager instance."><!-- mathjax --><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js" integrity="sha256-nvJJv9wWKEm88qvoQl9ekL2J+k/RWIsaSScxxlsrv8k=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/config/TeX-AMS-MML_HTMLorMML.js" integrity="sha256-84DKXVJXs0/F8OTMzX4UR909+jtl4G7SPypPavF+GfA=" crossorigin="anonymous"></script><!--[if lt IE 9]>
+<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+<![endif]--></head><body data-spy="scroll" data-target="#toc">
+    
+
+    <div class="container template-reference-topic">
+      <header><div class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <span class="navbar-brand">
+        <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
+      </span>
+    </div>
+
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav"><li>
+  <a href="../reference/index.html">Reference</a>
+</li>
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+    Articles
+     
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu" role="menu"><li>
+      <a href="../articles/CreatingAStudyPackage.html">Creating a study package</a>
+    </li>
+    <li>
+      <a href="../articles/DatabaseModeInDiagnosticsExplorer.html">Database mode in Diagnostics Explorer</a>
+    </li>
+    <li>
+      <a href="../articles/RunningCohortDiagnostics.html">Running Cohort Diagnostics</a>
+    </li>
+    <li>
+      <a href="../articles/ViewingResultsUsingDiagnosticsExplorer.html">Viewing results using Diagnostics Explorer</a>
+    </li>
+    <li>
+      <a href="../articles/WhatIsCohortDiagnostics.html">What is Cohort Diagnostics?</a>
+    </li>
+  </ul></li>
+<li>
+  <a href="../news/index.html">Changelog</a>
+</li>
+      </ul><ul class="nav navbar-nav navbar-right"><li>
+  <a href="https://ohdsi.github.io/Hades" class="external-link"><img src='https://ohdsi.github.io/Hades/images/hadesMini.png' width=80 height=17 style='vertical-align: top;'></a>
+</li>
+<li>
+  <a href="https://github.com/OHDSI/CohortDiagnostics/" class="external-link">
+    <span class="fab fa-github fa-lg"></span>
+     
+  </a>
+</li>
+      </ul></div><!--/.nav-collapse -->
+  </div><!--/.container -->
+</div><!--/.navbar -->
+
+      
+
+      </header><div class="row">
+  <div class="col-md-9 contents">
+    <div class="page-header">
+    <h1>Get database migrations instance</h1>
+    <small class="dont-index">Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/R/ResultsDataModel.R" class="external-link"><code>R/ResultsDataModel.R</code></a></small>
+    <div class="hidden name"><code>getDataMigrator.Rd</code></div>
+    </div>
+
+    <div class="ref-description">
+    <p>Returns ResultModelManager DataMigrationsManager instance.</p>
+    </div>
+
+    <div id="ref-usage">
+    <div class="sourceCode"><pre class="sourceCode r"><code><span><span class="fu">getDataMigrator</span><span class="op">(</span><span class="va">connectionDetails</span>, <span class="va">databaseSchema</span>, tablePrefix <span class="op">=</span> <span class="st">""</span><span class="op">)</span></span></code></pre></div>
+    </div>
+
+    <div id="arguments">
+    <h2>Arguments</h2>
+    <dl><dt>connectionDetails</dt>
+<dd><p>DatabaseConnector connection details object</p></dd>
+
+
+<dt>databaseSchema</dt>
+<dd><p>String schema where database schema lives</p></dd>
+
+
+<dt>tablePrefix</dt>
+<dd><p>(Optional) Use if a table prefix is used before table names (e.g. "cd_")</p></dd>
+
+</dl></div>
+    <div id="value">
+    <h2>Value</h2>
+    
+
+<p>Instance of ResultModelManager::DataMigrationManager that has interface for converting existing data models</p>
+    </div>
+
+  </div>
+  <div class="col-md-3 hidden-xs hidden-sm" id="pkgdown-sidebar">
+    <nav id="toc" data-toggle="toc" class="sticky-top"><h2 data-toc-skip>Contents</h2>
+    </nav></div>
+</div>
+
+
+      <footer><div class="copyright">
+  <p></p><p>Developed by Gowtham Rao, Martijn Schuemie, Patrick Ryan, James Weaver, Jamie Gilbert.</p>
+</div>
+
+<div class="pkgdown">
+  <p></p><p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.0.5.</p>
+</div>
+
+      </footer></div>
+
+  
+
+
+  
+
+  </body></html>
+
diff --git a/docs/reference/getDefaultCovariateSettings.html b/docs/reference/getDefaultCovariateSettings.html
new file mode 100644
index 000000000..cb45443c6
--- /dev/null
+++ b/docs/reference/getDefaultCovariateSettings.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<!-- Generated by pkgdown: do not edit by hand --><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Get default covariate settings — getDefaultCovariateSettings • CohortDiagnostics</title><!-- jquery --><script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.4.0/cosmo/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha256-nuL8/2cJ5NDSSwnKD8VqreErSWHtnEP9E7AySL+1ev4=" crossorigin="anonymous"></script><!-- bootstrap-toc --><link rel="stylesheet" href="../bootstrap-toc.css"><script src="../bootstrap-toc.js"></script><!-- Font Awesome icons --><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css" integrity="sha256-mmgLkCYLUQbXn0B1SRqzHar6dCnv9oZFPEC1g1cwlkk=" crossorigin="anonymous"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/v4-shims.min.css" integrity="sha256-wZjR52fzng1pJHwx4aV2AO3yyTOXrcDW7jBpJtTwVxw=" crossorigin="anonymous"><!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js" integrity="sha256-inc5kl9MA1hkeYUt+EC3BhlIgyp/2jDIyBLS6k3UxPI=" crossorigin="anonymous"></script><!-- headroom.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/headroom.min.js" integrity="sha256-AsUX4SJE1+yuDu5+mAVzJbuYNPHj/WroHuZ8Ir/CkE0=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/jQuery.headroom.min.js" integrity="sha256-ZX/yNShbjqsohH1k95liqY9Gd8uOiE1S4vZc+9KQ1K4=" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"><script src="../pkgdown.js"></script><meta property="og:title" content="Get default covariate settings — getDefaultCovariateSettings"><meta property="og:description" content="Default covariate settings for cohort diagnostics execution"><!-- mathjax --><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js" integrity="sha256-nvJJv9wWKEm88qvoQl9ekL2J+k/RWIsaSScxxlsrv8k=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/config/TeX-AMS-MML_HTMLorMML.js" integrity="sha256-84DKXVJXs0/F8OTMzX4UR909+jtl4G7SPypPavF+GfA=" crossorigin="anonymous"></script><!--[if lt IE 9]>
+<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+<![endif]--></head><body data-spy="scroll" data-target="#toc">
+    
+
+    <div class="container template-reference-topic">
+      <header><div class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <span class="navbar-brand">
+        <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
+      </span>
+    </div>
+
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav"><li>
+  <a href="../reference/index.html">Reference</a>
+</li>
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+    Articles
+     
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu" role="menu"><li>
+      <a href="../articles/CreatingAStudyPackage.html">Creating a study package</a>
+    </li>
+    <li>
+      <a href="../articles/DatabaseModeInDiagnosticsExplorer.html">Database mode in Diagnostics Explorer</a>
+    </li>
+    <li>
+      <a href="../articles/RunningCohortDiagnostics.html">Running Cohort Diagnostics</a>
+    </li>
+    <li>
+      <a href="../articles/ViewingResultsUsingDiagnosticsExplorer.html">Viewing results using Diagnostics Explorer</a>
+    </li>
+    <li>
+      <a href="../articles/WhatIsCohortDiagnostics.html">What is Cohort Diagnostics?</a>
+    </li>
+  </ul></li>
+<li>
+  <a href="../news/index.html">Changelog</a>
+</li>
+      </ul><ul class="nav navbar-nav navbar-right"><li>
+  <a href="https://ohdsi.github.io/Hades" class="external-link"><img src='https://ohdsi.github.io/Hades/images/hadesMini.png' width=80 height=17 style='vertical-align: top;'></a>
+</li>
+<li>
+  <a href="https://github.com/OHDSI/CohortDiagnostics/" class="external-link">
+    <span class="fab fa-github fa-lg"></span>
+     
+  </a>
+</li>
+      </ul></div><!--/.nav-collapse -->
+  </div><!--/.container -->
+</div><!--/.navbar -->
+
+      
+
+      </header><div class="row">
+  <div class="col-md-9 contents">
+    <div class="page-header">
+    <h1>Get default covariate settings</h1>
+    <small class="dont-index">Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/R/RunDiagnostics.R" class="external-link"><code>R/RunDiagnostics.R</code></a></small>
+    <div class="hidden name"><code>getDefaultCovariateSettings.Rd</code></div>
+    </div>
+
+    <div class="ref-description">
+    <p>Default covariate settings for cohort diagnostics execution</p>
+    </div>
+
+    <div id="ref-usage">
+    <div class="sourceCode"><pre class="sourceCode r"><code><span><span class="fu">getDefaultCovariateSettings</span><span class="op">(</span><span class="op">)</span></span></code></pre></div>
+    </div>
+
+
+  </div>
+  <div class="col-md-3 hidden-xs hidden-sm" id="pkgdown-sidebar">
+    <nav id="toc" data-toggle="toc" class="sticky-top"><h2 data-toc-skip>Contents</h2>
+    </nav></div>
+</div>
+
+
+      <footer><div class="copyright">
+  <p></p><p>Developed by Gowtham Rao, Martijn Schuemie, Patrick Ryan, James Weaver, Jamie Gilbert.</p>
+</div>
+
+<div class="pkgdown">
+  <p></p><p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.0.5.</p>
+</div>
+
+      </footer></div>
+
+  
+
+
+  
+
+  </body></html>
+
diff --git a/docs/reference/getDefaultVocabularyTableNames.html b/docs/reference/getDefaultVocabularyTableNames.html
index 5b594806b..8c736f259 100644
--- a/docs/reference/getDefaultVocabularyTableNames.html
+++ b/docs/reference/getDefaultVocabularyTableNames.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/getResultsDataModelSpecifications.html b/docs/reference/getResultsDataModelSpecifications.html
index f162b56b3..4e0bcae52 100644
--- a/docs/reference/getResultsDataModelSpecifications.html
+++ b/docs/reference/getResultsDataModelSpecifications.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/index.html b/docs/reference/index.html
index 6602ffffd..d5c87ca1f 100644
--- a/docs/reference/index.html
+++ b/docs/reference/index.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
@@ -103,6 +103,10 @@ <h2 id="all-functions">All functions <a href="#all-functions" class="anchor" ari
           <p><code><a href="getCohortCounts.html">getCohortCounts()</a></code> </p>
         </td>
         <td><p>Count the cohort(s)</p></td>
+      </tr><tr><td>
+          <p><code><a href="getDataMigrator.html">getDataMigrator()</a></code> </p>
+        </td>
+        <td><p>Get database migrations instance</p></td>
       </tr><tr><td>
           <p><code><a href="getDefaultCovariateSettings.html">getDefaultCovariateSettings()</a></code> </p>
         </td>
@@ -115,14 +119,14 @@ <h2 id="all-functions">All functions <a href="#all-functions" class="anchor" ari
           <p><code><a href="getResultsDataModelSpecifications.html">getResultsDataModelSpecifications()</a></code> </p>
         </td>
         <td><p>Get specifications for Cohort Diagnostics results data model</p></td>
-      </tr><tr><td>
-          <p><code><a href="launchCohortExplorer.html">launchCohortExplorer()</a></code> </p>
-        </td>
-        <td><p>Launch the CohortExplorer Shiny app</p></td>
       </tr><tr><td>
           <p><code><a href="launchDiagnosticsExplorer.html">launchDiagnosticsExplorer()</a></code> </p>
         </td>
         <td><p>Launch the Diagnostics Explorer Shiny app</p></td>
+      </tr><tr><td>
+          <p><code><a href="migrateDataModel.html">migrateDataModel()</a></code> </p>
+        </td>
+        <td><p>Migrate Data model</p></td>
       </tr><tr><td>
           <p><code><a href="runCohortRelationshipDiagnostics.html">runCohortRelationshipDiagnostics()</a></code> </p>
         </td>
diff --git a/docs/reference/launchDiagnosticsExplorer.html b/docs/reference/launchDiagnosticsExplorer.html
index 54a143094..8db5887fa 100644
--- a/docs/reference/launchDiagnosticsExplorer.html
+++ b/docs/reference/launchDiagnosticsExplorer.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/migrateDataModel.html b/docs/reference/migrateDataModel.html
new file mode 100644
index 000000000..f662c1c13
--- /dev/null
+++ b/docs/reference/migrateDataModel.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<!-- Generated by pkgdown: do not edit by hand --><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Migrate Data model — migrateDataModel • CohortDiagnostics</title><!-- jquery --><script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.4.0/cosmo/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha256-nuL8/2cJ5NDSSwnKD8VqreErSWHtnEP9E7AySL+1ev4=" crossorigin="anonymous"></script><!-- bootstrap-toc --><link rel="stylesheet" href="../bootstrap-toc.css"><script src="../bootstrap-toc.js"></script><!-- Font Awesome icons --><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css" integrity="sha256-mmgLkCYLUQbXn0B1SRqzHar6dCnv9oZFPEC1g1cwlkk=" crossorigin="anonymous"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/v4-shims.min.css" integrity="sha256-wZjR52fzng1pJHwx4aV2AO3yyTOXrcDW7jBpJtTwVxw=" crossorigin="anonymous"><!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js" integrity="sha256-inc5kl9MA1hkeYUt+EC3BhlIgyp/2jDIyBLS6k3UxPI=" crossorigin="anonymous"></script><!-- headroom.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/headroom.min.js" integrity="sha256-AsUX4SJE1+yuDu5+mAVzJbuYNPHj/WroHuZ8Ir/CkE0=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/jQuery.headroom.min.js" integrity="sha256-ZX/yNShbjqsohH1k95liqY9Gd8uOiE1S4vZc+9KQ1K4=" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"><script src="../pkgdown.js"></script><meta property="og:title" content="Migrate Data model — migrateDataModel"><meta property="og:description" content="Migrate data from current state to next state
+It is strongly advised that you have a backup of all data (either sqlite files, a backup database (in the case you
+are using a postgres backend) or have kept the csv/zip files from your data generation."><!-- mathjax --><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js" integrity="sha256-nvJJv9wWKEm88qvoQl9ekL2J+k/RWIsaSScxxlsrv8k=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/config/TeX-AMS-MML_HTMLorMML.js" integrity="sha256-84DKXVJXs0/F8OTMzX4UR909+jtl4G7SPypPavF+GfA=" crossorigin="anonymous"></script><!--[if lt IE 9]>
+<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+<![endif]--></head><body data-spy="scroll" data-target="#toc">
+    
+
+    <div class="container template-reference-topic">
+      <header><div class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <span class="navbar-brand">
+        <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
+      </span>
+    </div>
+
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav"><li>
+  <a href="../reference/index.html">Reference</a>
+</li>
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+    Articles
+     
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu" role="menu"><li>
+      <a href="../articles/CreatingAStudyPackage.html">Creating a study package</a>
+    </li>
+    <li>
+      <a href="../articles/DatabaseModeInDiagnosticsExplorer.html">Database mode in Diagnostics Explorer</a>
+    </li>
+    <li>
+      <a href="../articles/RunningCohortDiagnostics.html">Running Cohort Diagnostics</a>
+    </li>
+    <li>
+      <a href="../articles/ViewingResultsUsingDiagnosticsExplorer.html">Viewing results using Diagnostics Explorer</a>
+    </li>
+    <li>
+      <a href="../articles/WhatIsCohortDiagnostics.html">What is Cohort Diagnostics?</a>
+    </li>
+  </ul></li>
+<li>
+  <a href="../news/index.html">Changelog</a>
+</li>
+      </ul><ul class="nav navbar-nav navbar-right"><li>
+  <a href="https://ohdsi.github.io/Hades" class="external-link"><img src='https://ohdsi.github.io/Hades/images/hadesMini.png' width=80 height=17 style='vertical-align: top;'></a>
+</li>
+<li>
+  <a href="https://github.com/OHDSI/CohortDiagnostics/" class="external-link">
+    <span class="fab fa-github fa-lg"></span>
+     
+  </a>
+</li>
+      </ul></div><!--/.nav-collapse -->
+  </div><!--/.container -->
+</div><!--/.navbar -->
+
+      
+
+      </header><div class="row">
+  <div class="col-md-9 contents">
+    <div class="page-header">
+    <h1>Migrate Data model</h1>
+    <small class="dont-index">Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/R/ResultsDataModel.R" class="external-link"><code>R/ResultsDataModel.R</code></a></small>
+    <div class="hidden name"><code>migrateDataModel.Rd</code></div>
+    </div>
+
+    <div class="ref-description">
+    <p>Migrate data from current state to next state</p>
+<p>It is strongly advised that you have a backup of all data (either sqlite files, a backup database (in the case you
+are using a postgres backend) or have kept the csv/zip files from your data generation.</p>
+    </div>
+
+    <div id="ref-usage">
+    <div class="sourceCode"><pre class="sourceCode r"><code><span><span class="fu">migrateDataModel</span><span class="op">(</span><span class="va">connectionDetails</span>, <span class="va">databaseSchema</span>, tablePrefix <span class="op">=</span> <span class="st">""</span><span class="op">)</span></span></code></pre></div>
+    </div>
+
+    <div id="arguments">
+    <h2>Arguments</h2>
+    <dl><dt>connectionDetails</dt>
+<dd><p>DatabaseConnector connection details object</p></dd>
+
+
+<dt>databaseSchema</dt>
+<dd><p>String schema where database schema lives</p></dd>
+
+
+<dt>tablePrefix</dt>
+<dd><p>(Optional) Use if a table prefix is used before table names (e.g. "cd_")</p></dd>
+
+</dl></div>
+
+  </div>
+  <div class="col-md-3 hidden-xs hidden-sm" id="pkgdown-sidebar">
+    <nav id="toc" data-toggle="toc" class="sticky-top"><h2 data-toc-skip>Contents</h2>
+    </nav></div>
+</div>
+
+
+      <footer><div class="copyright">
+  <p></p><p>Developed by Gowtham Rao, Martijn Schuemie, Patrick Ryan, James Weaver, Jamie Gilbert.</p>
+</div>
+
+<div class="pkgdown">
+  <p></p><p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.0.5.</p>
+</div>
+
+      </footer></div>
+
+  
+
+
+  
+
+  </body></html>
+
diff --git a/docs/reference/runCohortRelationshipDiagnostics.html b/docs/reference/runCohortRelationshipDiagnostics.html
index f4ec5b69b..a6cdb1028 100644
--- a/docs/reference/runCohortRelationshipDiagnostics.html
+++ b/docs/reference/runCohortRelationshipDiagnostics.html
@@ -18,7 +18,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/runCohortTimeSeriesDiagnostics.html b/docs/reference/runCohortTimeSeriesDiagnostics.html
index 3873c1c97..7cb258d32 100644
--- a/docs/reference/runCohortTimeSeriesDiagnostics.html
+++ b/docs/reference/runCohortTimeSeriesDiagnostics.html
@@ -25,7 +25,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/takepackageDependencySnapshot.html b/docs/reference/takepackageDependencySnapshot.html
index bb2aa3a40..332056fe2 100644
--- a/docs/reference/takepackageDependencySnapshot.html
+++ b/docs/reference/takepackageDependencySnapshot.html
@@ -17,7 +17,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
diff --git a/docs/reference/timeExecution.html b/docs/reference/timeExecution.html
new file mode 100644
index 000000000..3453e1e6b
--- /dev/null
+++ b/docs/reference/timeExecution.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<!-- Generated by pkgdown: do not edit by hand --><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Internal utility function for logging execution of variables — timeExecution • CohortDiagnostics</title><!-- jquery --><script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script><!-- Bootstrap --><link href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.4.0/cosmo/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"><script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha256-nuL8/2cJ5NDSSwnKD8VqreErSWHtnEP9E7AySL+1ev4=" crossorigin="anonymous"></script><!-- bootstrap-toc --><link rel="stylesheet" href="../bootstrap-toc.css"><script src="../bootstrap-toc.js"></script><!-- Font Awesome icons --><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css" integrity="sha256-mmgLkCYLUQbXn0B1SRqzHar6dCnv9oZFPEC1g1cwlkk=" crossorigin="anonymous"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/v4-shims.min.css" integrity="sha256-wZjR52fzng1pJHwx4aV2AO3yyTOXrcDW7jBpJtTwVxw=" crossorigin="anonymous"><!-- clipboard.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js" integrity="sha256-inc5kl9MA1hkeYUt+EC3BhlIgyp/2jDIyBLS6k3UxPI=" crossorigin="anonymous"></script><!-- headroom.js --><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/headroom.min.js" integrity="sha256-AsUX4SJE1+yuDu5+mAVzJbuYNPHj/WroHuZ8Ir/CkE0=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/headroom/0.11.0/jQuery.headroom.min.js" integrity="sha256-ZX/yNShbjqsohH1k95liqY9Gd8uOiE1S4vZc+9KQ1K4=" crossorigin="anonymous"></script><!-- pkgdown --><link href="../pkgdown.css" rel="stylesheet"><script src="../pkgdown.js"></script><meta property="og:title" content="Internal utility function for logging execution of variables — timeExecution"><meta property="og:description" content="Internal utility function for logging execution of variables"><!-- mathjax --><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js" integrity="sha256-nvJJv9wWKEm88qvoQl9ekL2J+k/RWIsaSScxxlsrv8k=" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/config/TeX-AMS-MML_HTMLorMML.js" integrity="sha256-84DKXVJXs0/F8OTMzX4UR909+jtl4G7SPypPavF+GfA=" crossorigin="anonymous"></script><!--[if lt IE 9]>
+<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+<![endif]--></head><body data-spy="scroll" data-target="#toc">
+    
+
+    <div class="container template-reference-topic">
+      <header><div class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <span class="navbar-brand">
+        <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
+      </span>
+    </div>
+
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav"><li>
+  <a href="../reference/index.html">Reference</a>
+</li>
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+    Articles
+     
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu" role="menu"><li>
+      <a href="../articles/CreatingAStudyPackage.html">Creating a study package</a>
+    </li>
+    <li>
+      <a href="../articles/DatabaseModeInDiagnosticsExplorer.html">Database mode in Diagnostics Explorer</a>
+    </li>
+    <li>
+      <a href="../articles/RunningCohortDiagnostics.html">Running Cohort Diagnostics</a>
+    </li>
+    <li>
+      <a href="../articles/ViewingResultsUsingDiagnosticsExplorer.html">Viewing results using Diagnostics Explorer</a>
+    </li>
+    <li>
+      <a href="../articles/WhatIsCohortDiagnostics.html">What is Cohort Diagnostics?</a>
+    </li>
+  </ul></li>
+<li>
+  <a href="../news/index.html">Changelog</a>
+</li>
+      </ul><ul class="nav navbar-nav navbar-right"><li>
+  <a href="https://ohdsi.github.io/Hades" class="external-link"><img src='https://ohdsi.github.io/Hades/images/hadesMini.png' width=80 height=17 style='vertical-align: top;'></a>
+</li>
+<li>
+  <a href="https://github.com/OHDSI/CohortDiagnostics/" class="external-link">
+    <span class="fab fa-github fa-lg"></span>
+     
+  </a>
+</li>
+      </ul></div><!--/.nav-collapse -->
+  </div><!--/.container -->
+</div><!--/.navbar -->
+
+      
+
+      </header><div class="row">
+  <div class="col-md-9 contents">
+    <div class="page-header">
+    <h1>Internal utility function for logging execution of variables</h1>
+    <small class="dont-index">Source: <a href="https://github.com/OHDSI/CohortDiagnostics/blob/HEAD/R/Private.R" class="external-link"><code>R/Private.R</code></a></small>
+    <div class="hidden name"><code>timeExecution.Rd</code></div>
+    </div>
+
+    <div class="ref-description">
+    <p>Internal utility function for logging execution of variables</p>
+    </div>
+
+    <div id="ref-usage">
+    <div class="sourceCode"><pre class="sourceCode r"><code><span><span class="fu">timeExecution</span><span class="op">(</span></span>
+<span>  <span class="va">exportFolder</span>,</span>
+<span>  <span class="va">taskName</span>,</span>
+<span>  cohortIds <span class="op">=</span> <span class="cn">NULL</span>,</span>
+<span>  parent <span class="op">=</span> <span class="cn">NULL</span>,</span>
+<span>  start <span class="op">=</span> <span class="cn">NA</span>,</span>
+<span>  execTime <span class="op">=</span> <span class="cn">NA</span>,</span>
+<span>  expr <span class="op">=</span> <span class="cn">NULL</span></span>
+<span><span class="op">)</span></span></code></pre></div>
+    </div>
+
+
+  </div>
+  <div class="col-md-3 hidden-xs hidden-sm" id="pkgdown-sidebar">
+    <nav id="toc" data-toggle="toc" class="sticky-top"><h2 data-toc-skip>Contents</h2>
+    </nav></div>
+</div>
+
+
+      <footer><div class="copyright">
+  <p></p><p>Developed by Gowtham Rao, Martijn Schuemie, Patrick Ryan, James Weaver, Jamie Gilbert.</p>
+</div>
+
+<div class="pkgdown">
+  <p></p><p>Site built with <a href="https://pkgdown.r-lib.org/" class="external-link">pkgdown</a> 2.0.5.</p>
+</div>
+
+      </footer></div>
+
+  
+
+
+  
+
+  </body></html>
+
diff --git a/docs/reference/uploadResults.html b/docs/reference/uploadResults.html
index 134cd409a..cd3b0e2c4 100644
--- a/docs/reference/uploadResults.html
+++ b/docs/reference/uploadResults.html
@@ -19,7 +19,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">CohortDiagnostics</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.0</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="">3.1.1</span>
       </span>
     </div>
 
@@ -83,7 +83,7 @@ <h1>Upload results to the database server.</h1>
 
     <div id="ref-usage">
     <div class="sourceCode"><pre class="sourceCode r"><code><span><span class="fu">uploadResults</span><span class="op">(</span></span>
-<span>  connectionDetails <span class="op">=</span> <span class="cn">NULL</span>,</span>
+<span>  <span class="va">connectionDetails</span>,</span>
 <span>  <span class="va">schema</span>,</span>
 <span>  <span class="va">zipFileName</span>,</span>
 <span>  forceOverWriteOfSpecifications <span class="op">=</span> <span class="cn">FALSE</span>,</span>
diff --git a/docs/sitemap.xml b/docs/sitemap.xml
index 44b0e25d2..c353684ce 100644
--- a/docs/sitemap.xml
+++ b/docs/sitemap.xml
@@ -144,6 +144,9 @@
   <url>
     <loc>/reference/getCovariateValueResult.html</loc>
   </url>
+  <url>
+    <loc>/reference/getDataMigrator.html</loc>
+  </url>
   <url>
     <loc>/reference/getDatabaseReference.html</loc>
   </url>
@@ -219,6 +222,9 @@
   <url>
     <loc>/reference/loadCohortsFromPackage.html</loc>
   </url>
+  <url>
+    <loc>/reference/migrateDataModel.html</loc>
+  </url>
   <url>
     <loc>/reference/plotCohortComparisonStandardizedDifference.html</loc>
   </url>
diff --git a/extras/CohortDiagnostics.pdf b/extras/CohortDiagnostics.pdf
index b38c83891..289499bd8 100644
Binary files a/extras/CohortDiagnostics.pdf and b/extras/CohortDiagnostics.pdf differ
diff --git a/extras/EditIncrementalLogDiagnostics.R b/extras/EditIncrementalLogDiagnostics.R
index e01e56a74..b8e183126 100644
--- a/extras/EditIncrementalLogDiagnostics.R
+++ b/extras/EditIncrementalLogDiagnostics.R
@@ -31,7 +31,7 @@ for (i in (1:length(listFiles))) {
     col_types = readr::cols(),
     guess_max = min(1e7)
   ) %>%
-    dplyr::filter(!.data$task %in% tasksToRemove) %>%
+    dplyr::filter(!task %in% tasksToRemove) %>%
     readr::write_excel_csv(file = listFiles[[i]])
 }
 
diff --git a/extras/ExampleOfHowToCreateStudyPackageWithHydra.R b/extras/ExampleOfHowToCreateStudyPackageWithHydra.R
index 0e0ff166f..17c770ae0 100644
--- a/extras/ExampleOfHowToCreateStudyPackageWithHydra.R
+++ b/extras/ExampleOfHowToCreateStudyPackageWithHydra.R
@@ -44,7 +44,7 @@ cohortIds <- c(22040,
 ################# end of user input ##############
 webApiCohorts <- ROhdsiWebApi::getCohortDefinitionsMetaData(baseUrl = baseUrl)
 studyCohorts <-  webApiCohorts %>%
-        dplyr::filter(.data$id %in% cohortIds)
+        dplyr::filter(id %in% cohortIds)
 
 # compile them into a data table
 cohortDefinitionsArray <- list()
diff --git a/extras/PackageMaintenance.R b/extras/PackageMaintenance.R
index 207ded068..f35342e12 100644
--- a/extras/PackageMaintenance.R
+++ b/extras/PackageMaintenance.R
@@ -66,7 +66,7 @@ writeLines(text, con = file(filePath))
 
 
 version <- gsub("Version: ", "", version)
-filePath <- file.path("inst", "sql", "sql_server", "migrations", "UpdateVersionNumber.sql")
+filePath <- file.path("inst", "sql", "sql_server", "UpdateVersionNumber.sql")
 text <- readChar(filePath, file.info(filePath)$size)
 patternRep <- "\\{DEFAULT @version_number = '(\\d+\\.\\d+\\.\\d+)'\\}"
 text <- gsub(patternRep, paste0("\\{DEFAULT @version_number = '", version, "'\\}"), text)
diff --git a/extras/TestOtherPlatforms.R b/extras/TestOtherPlatforms.R
index 67e9526a5..d1ec01a14 100644
--- a/extras/TestOtherPlatforms.R
+++ b/extras/TestOtherPlatforms.R
@@ -31,7 +31,7 @@ loadTestCohortDefinitionSet <- function(cohortIds = NULL) {
     cohortFileNameValue = c("cohortId")
   )
   if (!is.null(cohortIds)) {
-    cohortDefinitionSet <- cohortDefinitionSet %>% dplyr::filter(.data$cohortId %in% cohortIds)
+    cohortDefinitionSet <- cohortDefinitionSet %>% dplyr::filter(cohortId %in% cohortIds)
   }
   
   cohortDefinitionSet
diff --git a/inst/doc/RunningCohortDiagnostics.pdf b/inst/doc/RunningCohortDiagnostics.pdf
index 13b582377..1b2c559c4 100644
Binary files a/inst/doc/RunningCohortDiagnostics.pdf and b/inst/doc/RunningCohortDiagnostics.pdf differ
diff --git a/inst/doc/ViewingResultsUsingDiagnosticsExplorer.pdf b/inst/doc/ViewingResultsUsingDiagnosticsExplorer.pdf
index 75d8ae679..73992ab5b 100644
Binary files a/inst/doc/ViewingResultsUsingDiagnosticsExplorer.pdf and b/inst/doc/ViewingResultsUsingDiagnosticsExplorer.pdf differ
diff --git a/inst/doc/WhatIsCohortDiagnostics.pdf b/inst/doc/WhatIsCohortDiagnostics.pdf
index 6249a79e3..6fb627c36 100644
Binary files a/inst/doc/WhatIsCohortDiagnostics.pdf and b/inst/doc/WhatIsCohortDiagnostics.pdf differ
diff --git a/inst/shiny/CohortExplorer/CohortExplorer.Rproj b/inst/shiny/CohortExplorer/CohortExplorer.Rproj
deleted file mode 100644
index 8e3c2ebc9..000000000
--- a/inst/shiny/CohortExplorer/CohortExplorer.Rproj
+++ /dev/null
@@ -1,13 +0,0 @@
-Version: 1.0
-
-RestoreWorkspace: Default
-SaveWorkspace: Default
-AlwaysSaveHistory: Default
-
-EnableCodeIndexing: Yes
-UseSpacesForTab: Yes
-NumSpacesForTab: 2
-Encoding: UTF-8
-
-RnwWeave: Sweave
-LaTeX: pdfLaTeX
diff --git a/inst/shiny/CohortExplorer/R/widgets.R b/inst/shiny/CohortExplorer/R/widgets.R
deleted file mode 100644
index b7a2c0999..000000000
--- a/inst/shiny/CohortExplorer/R/widgets.R
+++ /dev/null
@@ -1,53 +0,0 @@
-menuItemFileInput <-
-  function(inputId,
-           text,
-           icon = shiny::icon("file-text-o")) {
-    script <- "document.getElementById('%id%').click(); return false;"
-    script <- gsub("%id%", inputId, script)
-    list(div(fileInput(inputId, ""), style = "display: none;"),
-         tags$li(class = "treeview", a(
-           href = "#", onclick = script, icon, text
-         )))
-  }
-
-menuItemDownloadLink <-
-  function(inputId, label, icon = shiny::icon("floppy-o")) {
-    tags$li(
-      class = "treeview",
-      tags$a(
-        id = inputId,
-        class = "shiny-download-link",
-        href = "",
-        target = "_blank",
-        download = NA,
-        icon,
-        label
-      )
-    )
-  }
-
-menuItemCopyTextAreaToClipboard <-
-  function(textAreaId,
-           label,
-           icon = shiny::icon("clipboard")) {
-    script <- "
-  element = $('<textarea>').appendTo('body').val(document.getElementById('%id%').value).select();
-  document.execCommand('copy');
-  element.remove();
-  return false;
-  "
-    script <- gsub("%id%", textAreaId, script)
-    tags$li(class = "treeview", a(href = "#", onclick = script, icon, label))
-  }
-
-menuItemCopyDivToClipboard <-
-  function(divId, label, icon = shiny::icon("clipboard")) {
-    script <- "
-  element = $('<textarea>').appendTo('body').val(document.getElementById('%id%').textContent).select();
-  document.execCommand('copy');
-  element.remove();
-  return false;
-  "
-    script <- gsub("%id%", divId, script)
-    tags$li(class = "treeview", a(href = "#", onclick = script, icon, label))
-  }
diff --git a/inst/shiny/CohortExplorer/global.R b/inst/shiny/CohortExplorer/global.R
deleted file mode 100644
index 78868ba39..000000000
--- a/inst/shiny/CohortExplorer/global.R
+++ /dev/null
@@ -1,80 +0,0 @@
-library(shiny)
-library(ggplot2)
-library(DT)
-library(plotly)
-library(magrittr)
-
-cohortTable <- shinySettings$cohortTable
-cohortDatabaseSchema <- shinySettings$cohortDatabaseSchema
-cdmDatabaseSchema <- shinySettings$cdmDatabaseSchema
-cohortDefinitionId <- shinySettings$cohortDefinitionId
-
-if (!is.null(shinySettings$vocabularyDatabaseSchema)) {
-  vocabularyDatabaseSchema <- shinySettings$vocabularyDatabaseSchema
-} else {
-  vocabularyDatabaseSchema <- shinySettings$cdmDatabaseSchema
-}
-
-if (!is.null(shinySettings$tempEmulationSchema)) {
-  tempEmulationSchema <- shinySettings$tempEmulationSchema
-}
-
-if (!is.null(shinySettings$subjectIds)) {
-  subjectIds <- shinySettings$subjectIds
-} else {
-  subjectIds <- NULL
-}
-
-if (!is.null(shinySettings$sampleSize)) {
-  sampleSize <- shinySettings$sampleSize
-}
-
-connection <- DatabaseConnector::connect(connectionDetails)
-onStop(function() {
-  if (DBI::dbIsValid(connection)) {
-    DatabaseConnector::disconnect(connection = connection)
-  }
-})
-
-# take a random sample
-if (is.null(subjectIds)) {
-  sql <- "SELECT TOP @sample_size subject_id
-          FROM (
-          	SELECT DISTINCT subject_id
-          	FROM @cohort_database_schema.@cohort_table
-          	WHERE cohort_definition_id = @cohort_definition_id
-          	) all_ids
-          ORDER BY NEWID();"
-
-  writeLines("Attempting to find subjects in cohort table.")
-  subjectIds <- DatabaseConnector::renderTranslateQuerySql(connection = connection,
-                                                           sql = sql,
-                                                           sample_size = sampleSize,
-                                                           cohort_database_schema = cohortDatabaseSchema,
-                                                           cohort_table = cohortTable,
-                                                           cohort_definition_id = cohortDefinitionId)[, 1]
-}
-
-if (length(subjectIds) == 0) {
-  stop("No subjects found in cohort ",
-       cohortDefinitionId)
-}
-
-sql <- SqlRender::readSql("sql/GetCohort.sql")
-cohort <- DatabaseConnector::renderTranslateQuerySql(connection = connection,
-                                                     sql = sql,
-                                                     cohort_database_schema = cohortDatabaseSchema,
-                                                     cohort_table = cohortTable,
-                                                     cdm_database_schema = cdmDatabaseSchema,
-                                                     cohort_definition_id = cohortDefinitionId,
-                                                     subject_ids = subjectIds,
-                                                     snakeCaseToCamelCase = TRUE) %>%
-  dplyr::tibble() %>%
-  dplyr::arrange(subjectId, cohortStartDate)
-subjectIds <- unique(cohort$subjectId)
-
-if (nrow(cohort) == 0) {
-  stop("Cohort is empty")
-}
-
-eventSql <- SqlRender::readSql("sql/GetEvents.sql")
diff --git a/inst/shiny/CohortExplorer/server.R b/inst/shiny/CohortExplorer/server.R
deleted file mode 100644
index 029668a8e..000000000
--- a/inst/shiny/CohortExplorer/server.R
+++ /dev/null
@@ -1,296 +0,0 @@
-shinyServer(function(input, output, session) {
-  
-  subject <- reactiveValues(index = 1)
-  
-  queryResult <- reactive({
-    if (is.null(input$domains)) {
-      return(data.frame())
-    } else {
-      events <- DatabaseConnector::renderTranslateQuerySql(
-        connection = connection,
-        sql = eventSql,
-        cdm_database_schema = cdmDatabaseSchema,
-        subject_id = subjectIds[subject$index],
-        drug_era = "Drug era" %in% input$domains,
-        drug_exposure = "Drug exposure" %in% input$domains,
-        condition_era = "Condition era" %in% input$domains,
-        condition_occurrence = "Condition occurrence" %in% input$domains,
-        procedure = "Procedure" %in% input$domains,
-        measurement = "Measurement" %in% input$domains,
-        observation = "Observation" %in% input$domains,
-        visit = "Visit" %in% input$domains,
-        observation_period = "Observation period" %in% input$domains,
-        vocabulary_database_schema = vocabularyDatabaseSchema, 
-        snakeCaseToCamelCase = TRUE
-      ) %>% 
-        dplyr::tibble()
-      colnames(events)[colnames(events) == "domainName"] <- "domain"
-      return(events)
-    }
-  })
-  
-  filteredEvents <- reactive({
-    events <- queryResult()
-    if (nrow(events) != 0 && input$filterRegex != "") {
-      events <-
-        events[grepl(input$filterRegex, events$conceptName, ignore.case = TRUE) |
-                 events$domain == "Visit" |
-                 events$domain == "Observation period",]
-    }
-    if (nrow(events) != 0) {
-      events <- events[order(events$conceptId),]
-      getY <- function(subset) {
-        uniqueConceptIds <- unique(subset$conceptId)
-        subset$y <- match(subset$conceptId, uniqueConceptIds)
-        return(subset)
-      }
-      events <- lapply(split(events, events$domain), getY)
-      events <- do.call("rbind", events)
-    }
-    return(events)
-  })
-  
-  colorScale <- reactive({
-    domains <- c("Cohort", input$domains)
-    if (length(domains) == 1) {
-      colors <- c("Red")
-    } else {
-      temp <-
-        RColorBrewer::brewer.pal(max(3, length(domains) - 1), "Set2")
-      colors <- c("Red", temp[1:(length(domains) - 1)])
-    }
-    names(colors) <- domains
-    return(colors)
-  })
-  
-  observeEvent(input$nextButton, {
-    if (subject$index < length(subjectIds)) {
-      subject$index <- subject$index + 1
-    }
-  })
-  
-  observeEvent(input$previousButton, {
-    if (subject$index > 1) {
-      subject$index <- subject$index - 1
-    }
-  })
-  
-  output$subjectId <- renderText({
-    return(subjectIds[subject$index])
-  })
-  
-  output$age <- renderText({
-    return(cohort$age[cohort$subjectId ==  subjectIds[subject$index]][1])
-  })
-  
-  output$gender <- renderText({
-    return(cohort$gender[cohort$subjectId ==  subjectIds[subject$index]][1])
-  })
-  
-  camelCaseToPretty <- function(string) {
-    string <- gsub("([A-Z])", " \\1", string)
-    substr(string, 1, 1) <- toupper(substr(string, 1, 1))
-    return(string)
-  }
-  
-  output$eventTable <- renderDataTable({
-    events <- filteredEvents()
-    events$y <- NULL
-    cohortsOfSubject <-
-      which(cohort$subjectId == subjectIds[subject$index])
-    for (i in cohortsOfSubject) {
-      events <- rbind(
-        events,
-        data.frame(
-          domain = "Cohort",
-          conceptId = cohortDefinitionId,
-          conceptName = "Cohort entry",
-          typeConceptName = "",
-          startDate = cohort$cohortStartDate[i],
-          endDate = cohort$cohortEndDate[i]
-        )
-      )
-    }
-    events <- events[order(events$startDate),]
-    
-    truncScript <- "function(data, type, row, meta) {\n
-      return type === 'display' && data != null && data.length > %s ?\n
-        '<span title=\"' + data + '\">' + data.substr(0, %s) + '...</span>' : data;\n
-     }"
-    options = list(
-      pageLength = 10000,
-      searching = FALSE,
-      lengthChange = FALSE,
-      ordering = FALSE,
-      paging = FALSE,
-      scrollY = '75vh',
-      columnDefs = list(list(
-        targets = 2,
-        render = JS(sprintf(truncScript, 90, 90))
-      ),
-      list(
-        targets = 3,
-        render = JS(sprintf(truncScript, 40, 40))
-      ))
-    )
-    
-    selection = list(mode = "single", target = "row")
-    table <- datatable(
-      events,
-      options = options,
-      selection = selection,
-      rownames = FALSE,
-      colnames = camelCaseToPretty(colnames(events)),
-      class = "stripe nowrap compact"
-    )
-    colors <- colorScale()
-    table <- formatStyle(
-      table = table,
-      columns = 1,
-      target = "cell",
-      backgroundColor = styleEqual(names(colors), colors)
-    )
-    return(table)
-  })
-  
-  output$plotSmall <- renderPlotly(plot())
-  output$plotBig <- renderPlotly(plot())
-  
-  plot <- reactive({
-    events <- filteredEvents()
-    if (nrow(events) == 0) {
-      return(NULL)
-    } else {
-      colors <- colorScale()
-      domains <- aggregate(y ~ domain, events, max)
-      domains <- domains[order(domains$domain),]
-      domains$offset <- cumsum(domains$y) - domains$y
-      events <- merge(events, domains[, c("domain", "offset")])
-      events$y <- events$y + events$offset
-      yRange <- c(min(events$y) - 1, max(events$y) + 1)
-      events$text <-
-        sprintf(
-          "%s - %s<br>%s<br>%s",
-          events$startDate,
-          events$endDate,
-          events$conceptName,
-          events$typeConceptName
-        )
-      eventsPerY <- aggregate(domain ~ y, data = events, length)
-      yGrid <- eventsPerY$y[eventsPerY$domain > 1]
-      
-      yAxis <- list(
-        title = "",
-        tickmode = "array",
-        tickvals = yGrid,
-        zeroline = FALSE,
-        showline = FALSE,
-        showticklabels = FALSE,
-        showgrid = TRUE,
-        range = yRange,
-        fixedrange = TRUE
-      )
-      xAxis <- list(
-        title = "",
-        zeroline = FALSE,
-        showline = FALSE,
-        showticklabels = TRUE,
-        showgrid = TRUE
-      )
-      plot <- plot_ly() %>%
-        add_trace(
-          data = events,
-          x = ~ startDate,
-          y = ~ y,
-          color = ~ domain,
-          colors = colors,
-          type = 'scatter',
-          mode = 'markers',
-          text = ~ text,
-          hovertemplate = "%{text}"
-        ) %>%
-        add_segments(
-          data = events,
-          x = ~ startDate,
-          y = ~ y,
-          xend = ~ endDate,
-          yend = ~ y,
-          color = ~ domain,
-          showlegend = FALSE,
-          hoverinfo = "skip"
-        )
-      
-      shapes <- list()
-      cohortsOfSubject <-
-        which(cohort$subjectId == subjectIds[subject$index])
-      first <- TRUE
-      for (i in cohortsOfSubject) {
-        data <- data.frame(
-          date = rep(cohort$cohortStartDate[i], 2),
-          y = rep(yRange, 2),
-          text = sprintf(
-            "%s - %s",
-            cohort$cohortStartDate[i],
-            cohort$cohortEndDate[i]
-          )
-        )
-        plot <- plot %>% add_lines(
-          x = ~ date,
-          y = ~ y,
-          data = data,
-          mode = "lines",
-          line = list(color = colors["Cohort"]),
-          name = "Cohort",
-          text = ~ text,
-          hovertemplate = "%{text}",
-          showlegend = first
-        )
-        first <- FALSE
-        if (!is.na(cohort$cohortEndDate[i])) {
-          shapes[[length(shapes) + 1]] <- list(
-            type = "rect",
-            fillcolor = "red",
-            line = list(color = colors["Cohort"]),
-            opacity = 0.3,
-            x0 = cohort$cohortStartDate[i],
-            x1 = cohort$cohortEndDate[i],
-            xref = "startDate",
-            y0 = yRange[1],
-            y1 = yRange[2],
-            yref = "y"
-          )
-        }
-      }
-      plot <- plot %>% layout(
-        yaxis = yAxis,
-        xaxis = xAxis,
-        shapes = shapes,
-        legend = list(orientation = 'h'),
-        margin =  list(
-          l = 1,
-          r = 1,
-          b = 1,
-          t = 25,
-          pad = 1
-        )
-      )
-      plot
-    }
-  })
-  
-  observeEvent(input$filterInfo, {
-    showModal(
-      modalDialog(
-        title = "Concept Name Filter",
-        easyClose = TRUE,
-        footer = NULL,
-        size = "l",
-        HTML(
-          "Filter the concept to include in the plot and table by concept name using a regular expression.
-           For example, the regular expression 'celecox|diclof' finds concepts like 'Celecoxib 200mg Oral Tablet' and 'Diclofenac'.
-           See <a href='https://en.wikipedia.org/wiki/Regular_expression'>Wikipedia</a> for more information on regular expressions."
-        )
-      )
-    )
-  })
-})
diff --git a/inst/shiny/CohortExplorer/sql/GetCohort.sql b/inst/shiny/CohortExplorer/sql/GetCohort.sql
deleted file mode 100644
index 415eae7cc..000000000
--- a/inst/shiny/CohortExplorer/sql/GetCohort.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT subject_id,
-	cohort_start_date,
-	cohort_end_date,
-	YEAR(cohort_start_date) - year_of_birth AS age,
-	concept_name AS gender
-FROM @cohort_database_schema.@cohort_table
-INNER JOIN @cdm_database_schema.person ON person_id = subject_id
-INNER JOIN @cdm_database_schema.concept ON gender_concept_id = concept_id
-WHERE cohort_definition_id = @cohort_definition_id
-	AND subject_id IN (@subject_ids);
diff --git a/inst/shiny/CohortExplorer/sql/GetEvents.sql b/inst/shiny/CohortExplorer/sql/GetEvents.sql
deleted file mode 100644
index 19e2e568d..000000000
--- a/inst/shiny/CohortExplorer/sql/GetEvents.sql
+++ /dev/null
@@ -1,120 +0,0 @@
-SELECT domain_name,
-  concept.concept_id,
-  concept.concept_name,
-  CASE 
-	WHEN type_concept.concept_id = 0 THEN CAST('' AS VARCHAR(255))
-	ELSE type_concept.concept_name 
-  END AS type_concept_name,
-  start_date,
-  end_date
-FROM (
-{@drug_era} ? {
-  SELECT drug_era_start_date AS start_date,
-    drug_era_end_date AS end_date,
-    drug_concept_id AS concept_id,
-	CAST(0 AS INT) AS type_concept_id,
-    CAST('Drug era' AS VARCHAR(255)) AS domain_name
-  FROM @cdm_database_schema.drug_era
-  WHERE drug_era.person_id = @subject_id
-}
-{@drug_exposure} ? {
-{@drug_era} ? {
-  UNION ALL
-}
-  SELECT drug_exposure_start_date AS start_date,
-    drug_exposure_end_date AS end_date,
-    drug_concept_id AS concept_id,
-	drug_type_concept_id AS type_concept_id,
-    CAST('Drug exposure' AS VARCHAR(255)) AS domain_name
-  FROM @cdm_database_schema.drug_exposure
-  WHERE drug_exposure.person_id = @subject_id
-}
-{@condition_era} ? {
-{@drug_era | @drug_exposure} ? {
-  UNION ALL
-}
-  SELECT condition_era_start_date AS start_date,
-    condition_era_end_date AS end_date,
-    condition_concept_id AS concept_id,
-	CAST(0 AS INT) AS type_concept_id,
-    CAST('Condition era' AS VARCHAR(255)) AS domain_name
-  FROM @cdm_database_schema.condition_era
-  WHERE condition_era.person_id = @subject_id
-}
-{@condition_occurrence} ? {
-{@drug_era | @drug_exposure | @condition_era} ? {
-  UNION ALL
-}
-  SELECT condition_start_date AS start_date,
-    condition_end_date AS end_date,
-    condition_concept_id AS concept_id,
-	condition_type_concept_id AS type_concept_id,
-    CAST('Condition occurrence' AS VARCHAR(255)) AS domain_name
-  FROM @cdm_database_schema.condition_occurrence
-  WHERE condition_occurrence.person_id = @subject_id
-}
-{@procedure} ? {
-{@drug_era | @drug_exposure | @condition_era | @condition_occurrence} ? {
-  UNION ALL
-}
-  SELECT procedure_date AS start_date,
-    procedure_date AS end_date,
-    procedure_concept_id AS concept_id,
-	procedure_type_concept_id AS type_concept_id,
-    CAST('Procedure' AS VARCHAR(255)) AS domain_name
-  FROM @cdm_database_schema.procedure_occurrence
-  WHERE procedure_occurrence.person_id = @subject_id
-}
-{@visit} ? {
-{@drug_era | @drug_exposure | @condition_era | @condition_occurrence | @procedure} ? {
-  UNION ALL
-}
-  SELECT visit_start_date AS start_date,
-    visit_end_date AS end_date,
-    visit_concept_id AS concept_id,
-	visit_type_concept_id AS type_concept_id,
-    CAST('Visit' AS VARCHAR(255)) AS domain_name
-  FROM @cdm_database_schema.visit_occurrence
-  WHERE visit_occurrence.person_id = @subject_id
-}
-{@observation_period} ? {
-{@drug_era | @drug_exposure | @condition_era | @condition_occurrence | @procedure | @visit} ? {
-  UNION ALL
-}
-  SELECT observation_period_start_date AS start_date,
-    observation_period_end_date AS end_date,
-    CAST(0 AS INT) AS concept_id,
-	period_type_concept_id AS type_concept_id,
-    CAST('Observation period' AS VARCHAR(255)) AS domain_name
-  FROM @cdm_database_schema.observation_period
-  WHERE observation_period.person_id = @subject_id
-}
-{@observation} ? {
-{@drug_era | @drug_exposure | @condition_era | @condition_occurrence | @procedure | @visit | @observation_period} ? {
-  UNION ALL
-}
-  SELECT observation_date AS start_date,
-    observation_date AS end_date,
-    observation_concept_id AS concept_id,
-	observation_type_concept_id AS type_concept_id,
-    CAST('Observation' AS VARCHAR(255)) AS domain_name
-  FROM @cdm_database_schema.observation
-  WHERE observation.person_id = @subject_id
-}
-{@measurement} ? {
-{@drug_era | @drug_exposure | @condition_era | @condition_occurrence | @procedure | @visit | @observation_period | @observation} ? {
-  UNION ALL
-}
-  SELECT measurement_date AS start_date,
-    measurement_date AS end_date,
-    measurement_concept_id AS concept_id,
-	measurement_type_concept_id AS type_concept_id,
-    CAST('Measurement' AS VARCHAR(255)) AS domain_name
-  FROM @cdm_database_schema.measurement
-  WHERE measurement.person_id = @subject_id
-}
-  ) all_events
-INNER JOIN @vocabulary_database_schema.concept concept
-  ON all_events.concept_id = concept.concept_id
-INNER JOIN @vocabulary_database_schema.concept type_concept
-  ON all_events.type_concept_id = type_concept.concept_id;
diff --git a/inst/shiny/CohortExplorer/ui.R b/inst/shiny/CohortExplorer/ui.R
deleted file mode 100644
index 2d759d346..000000000
--- a/inst/shiny/CohortExplorer/ui.R
+++ /dev/null
@@ -1,54 +0,0 @@
-shinyUI(fluidPage(titlePanel(
-  sprintf(
-    "Exploring cohort %s in %s.%s",
-    cohortDefinitionId,
-    cohortDatabaseSchema,
-    cohortTable
-  )
-),
-fluidRow(
-  column(
-    2,
-    tags$label(class = "control-label", `for` = "subjectId", "Subject ID"),
-    textOutput("subjectId"),
-    tags$label(class = "control-label", `for` = "age", "Age at First Index Date"),
-    textOutput("age"),
-    tags$label(class = "control-label", `for` = "gender", "Gender"),
-    textOutput("gender"),
-    actionButton("previousButton", "<"),
-    actionButton("nextButton", ">"),
-    checkboxGroupInput(
-      "domains",
-      label = "Domains",
-      choices = c(
-        "Condition era",
-        "Condition occurrence",
-        "Drug era",
-        "Drug exposure",
-        "Procedure",
-        "Measurement",
-        "Observation",
-        "Visit",
-        "Observation period"
-      )
-    ),
-    textAreaInput(
-      "filterRegex",
-      div("Concept Name Filter", actionLink("filterInfo", "", icon = icon("info-circle"))),
-      placeholder = "regex"
-    ),
-    checkboxInput("showPlot", "Show Plot", value = TRUE),
-    checkboxInput("showTable", "Show Table", value = TRUE),
-  ),
-  column(
-    10,
-    conditionalPanel(
-      condition = "input.showTable==1",
-      conditionalPanel(condition = "input.showPlot==1",
-                       plotlyOutput("plotSmall", height = "400px")),
-      dataTableOutput("eventTable")
-    ),
-    conditionalPanel(condition = "input.showTable==0 & input.showPlot==1",
-                     plotlyOutput("plotBig", height = "800px"),)
-  )
-)))
diff --git a/inst/shiny/DiagnosticsExplorer/R/CharacterizationModule.R b/inst/shiny/DiagnosticsExplorer/R/CharacterizationModule.R
index c09269fde..3dbda5787 100644
--- a/inst/shiny/DiagnosticsExplorer/R/CharacterizationModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/CharacterizationModule.R
@@ -160,7 +160,8 @@ characterizationView <- function(id) {
               choices = c("All", "Proportion", "Continuous"),
               selected = "All",
               inline = TRUE
-            )
+            ),
+            p("Percentage displayed where only proportional data is selected")
           ),
           shiny::column(
             width = 4,
@@ -239,12 +240,12 @@ characterizationModule <- function(id,
   shiny::moduleServer(id, function(input, output, session) {
 
     timeIdOptions <- getResultsTemporalTimeRef(dataSource = dataSource) %>%
-      dplyr::arrange(.data$sequence)
+      dplyr::arrange(sequence)
 
     selectedTimeIds <- shiny::reactive({
       timeIdOptions %>%
-        dplyr::filter(.data$temporalChoices %in% input$timeIdChoices) %>%
-        dplyr::select(.data$timeId) %>%
+        dplyr::filter(temporalChoices %in% input$timeIdChoices) %>%
+        dplyr::select(timeId) %>%
         dplyr::pull()
     })
 
@@ -257,8 +258,8 @@ characterizationModule <- function(id,
       }
 
       jsonExpression <- cohortTable %>%
-        dplyr::filter(.data$cohortId == input$targetCohort) %>%
-        dplyr::select(.data$json)
+        dplyr::filter(cohortId == input$targetCohort) %>%
+        dplyr::select(json)
       jsonExpression <-
         RJSONIO::fromJSON(jsonExpression$json, digits = 23)
       expression <-
@@ -274,9 +275,9 @@ characterizationModule <- function(id,
     shiny::observe({
       # Default time windows
       selectedTimeWindows <- timeIdOptions %>%
-        dplyr::filter(.data$primaryTimeId == 1) %>%
-        dplyr::filter(.data$isTemporal == 1) %>%
-        dplyr::arrange(.data$sequence) %>%
+        dplyr::filter(primaryTimeId == 1) %>%
+        dplyr::filter(isTemporal == 1) %>%
+        dplyr::arrange(sequence) %>%
         dplyr::pull("temporalChoices")
 
       shinyWidgets::updatePickerInput(session,
@@ -341,16 +342,16 @@ characterizationModule <- function(id,
       output <- c()
       if (hasData(resolved)) {
         resolved <- resolved %>%
-          dplyr::filter(.data$databaseId %in% selectedDatabaseIds()) %>%
-          dplyr::filter(.data$cohortId %in% targetCohortId()) %>%
-          dplyr::filter(.data$conceptSetId %in% conceptSetIds())
+          dplyr::filter(databaseId %in% selectedDatabaseIds()) %>%
+          dplyr::filter(cohortId %in% targetCohortId()) %>%
+          dplyr::filter(conceptSetId %in% conceptSetIds())
         output <- c(output, resolved$conceptId) %>% unique()
       }
       if (hasData(mapped)) {
         mapped <- mapped %>%
-          dplyr::filter(.data$databaseId %in% selectedDatabaseIds()) %>%
-          dplyr::filter(.data$cohortId %in% targetCohortId()) %>%
-          dplyr::filter(.data$conceptSetId %in% conceptSetIds())
+          dplyr::filter(databaseId %in% selectedDatabaseIds()) %>%
+          dplyr::filter(cohortId %in% targetCohortId()) %>%
+          dplyr::filter(conceptSetId %in% conceptSetIds())
         output <- c(output, mapped$conceptId) %>% unique()
       }
 
@@ -372,8 +373,8 @@ characterizationModule <- function(id,
             width = 4,
             tags$b("Cohort :"),
             paste(cohortTable %>%
-                    dplyr::filter(.data$cohortId %in% targetCohortId()) %>%
-                    dplyr::select(.data$cohortName) %>%
+                    dplyr::filter(cohortId %in% targetCohortId()) %>%
+                    dplyr::select(cohortName) %>%
                     dplyr::pull(),
                   collapse = ", ")
           ),
@@ -381,8 +382,8 @@ characterizationModule <- function(id,
             width = 8,
             tags$b("Database(s) :"),
             paste(databaseTable %>%
-                    dplyr::filter(.data$databaseId %in% selectedDatabaseIds()) %>%
-                    dplyr::select(.data$databaseName) %>%
+                    dplyr::filter(databaseId %in% selectedDatabaseIds()) %>%
+                    dplyr::select(databaseName) %>%
                     dplyr::pull(),
                   collapse = ", ")
           )
@@ -435,7 +436,7 @@ characterizationModule <- function(id,
       if (hasData(temporalAnalysisRef)) {
         characterizationAnalysisOptionsUniverse <- analysisNameOptions
         charcterizationAnalysisOptionsSelected <- temporalAnalysisRef %>%
-          dplyr::pull(.data$analysisName) %>%
+          dplyr::pull(analysisName) %>%
           unique()
       }
 
@@ -456,7 +457,7 @@ characterizationModule <- function(id,
       if (hasData(temporalAnalysisRef)) {
         characterizationDomainOptionsUniverse <- domainIdOptions
         charcterizationDomainOptionsSelected <- temporalAnalysisRef %>%
-          dplyr::pull(.data$domainId) %>%
+          dplyr::pull(domainId) %>%
           unique()
       }
 
@@ -489,22 +490,22 @@ characterizationModule <- function(id,
       }
 
       data <- data %>%
-        dplyr::filter(.data$analysisId %in% analysisIdInCohortCharacterization) %>%
-        dplyr::filter(.data$timeId %in% c(characterizationTimeIdChoices$timeId %>% unique(), NA))
+        dplyr::filter(analysisId %in% analysisIdInCohortCharacterization) %>%
+        dplyr::filter(timeId %in% c(characterizationTimeIdChoices$timeId %>% unique(), NA))
       if (!hasData(data)) {
         return(NULL)
       }
 
       data <- data %>%
         dplyr::select(
-          .data$cohortId,
-          .data$databaseId,
-          .data$analysisId,
-          .data$covariateId,
-          .data$covariateName,
-          .data$mean
+          cohortId,
+          databaseId,
+          analysisId,
+          covariateId,
+          covariateName,
+          mean
         ) %>%
-        dplyr::rename(sumValue = .data$mean)
+        dplyr::rename(sumValue = mean)
 
 
       table <- data %>%
@@ -580,9 +581,9 @@ characterizationModule <- function(id,
       }
 
       data <- data %>%
-        dplyr::filter(.data$timeId %in% selectedTimeIds()) %>%
-        dplyr::filter(.data$analysisName %in% input$characterizationAnalysisNameFilter) %>%
-        dplyr::filter(.data$domainId %in% input$characterizationDomainIdFilter)
+        dplyr::filter(timeId %in% selectedTimeIds()) %>%
+        dplyr::filter(analysisName %in% input$characterizationAnalysisNameFilter) %>%
+        dplyr::filter(domainId %in% input$characterizationDomainIdFilter)
 
       if (!hasData(data)) {
         return(NULL)
@@ -635,33 +636,33 @@ characterizationModule <- function(id,
 
       data <- data %>%
         dplyr::select(
-          .data$covariateName,
-          .data$analysisName,
-          .data$startDay,
-          .data$endDay,
-          .data$conceptId,
-          .data$isBinary,
-          .data$mean,
-          .data$sd,
-          .data$cohortId,
-          .data$databaseId,
-          .data$temporalChoices
+          covariateName,
+          analysisName,
+          startDay,
+          endDay,
+          conceptId,
+          isBinary,
+          mean,
+          sd,
+          cohortId,
+          databaseId,
+          temporalChoices
         )
-
+      showAsPercentage <- any(input$proportionOrContinuous == "Proportion", all(data$isBinary == "Y"))
       if (input$proportionOrContinuous == "Proportion") {
         data <- data %>%
-          dplyr::filter(.data$isBinary == "Y") %>%
-          dplyr::select(-.data$isBinary)
+          dplyr::filter(isBinary == "Y") %>%
+          dplyr::select(-isBinary)
       } else if (input$proportionOrContinuous == "Continuous") {
         data <- data %>%
-          dplyr::filter(.data$isBinary == "N") %>%
-          dplyr::select(-.data$isBinary)
+          dplyr::filter(isBinary == "N") %>%
+          dplyr::select(-isBinary)
       }
 
       if (hasData(selectedConceptSets())) {
         if (hasData(conceptSetIds())) {
           data <- data %>%
-            dplyr::filter(.data$conceptId %in% getFilteredConceptIds())
+            dplyr::filter(conceptId %in% getFilteredConceptIds())
         }
       }
       validate(need(hasData(data), "No data for selected combination"))
@@ -675,7 +676,7 @@ characterizationModule <- function(id,
         countLocation = countLocation,
         dataColumns = dataColumnFields,
         maxCount = maxCountValue,
-        showDataAsPercent = FALSE,
+        showDataAsPercent = showAsPercentage,
         sort = TRUE,
         pageSize = 100
       )
@@ -701,31 +702,41 @@ characterizationModule <- function(id,
         value = 0
       )
 
-      temporalChoices <- data$temporalChoices %>% unique()
+      showAsPercentage <- any(input$proportionOrContinuous == "Proportion", all(data$isBinary == "Y"))
+      if (input$proportionOrContinuous == "Proportion") {
+        data <- data %>%
+          dplyr::filter(isBinary == "Y") %>%
+          dplyr::select(-isBinary)
+      } else if (input$proportionOrContinuous == "Continuous") {
+        data <- data %>%
+          dplyr::filter(isBinary == "N") %>%
+          dplyr::select(-isBinary)
+      }
+
+      temporalChoicesVar <- data$temporalChoices %>% unique()
 
       data <-
         data %>% dplyr::inner_join(databaseTable %>%
-                                     dplyr::select(.data$databaseId, .data$databaseName),
+                                     dplyr::select(databaseId, databaseName),
                                    by = "databaseId")
 
       if (hasData(selectedConceptSets())) {
-        if (hasData(getFilteredConceptIds())) {
+        if (hasData(conceptSetIds())) {
           data <- data %>%
-            dplyr::filter(.data$conceptId %in% getFilteredConceptIds())
+            dplyr::filter(conceptId %in% getFilteredConceptIds())
         }
       }
 
-
       keyColumns <- c("covariateName", "analysisName", "conceptId", "databaseName")
       data <- data %>%
         dplyr::select(
-          .data$covariateName,
-          .data$analysisName,
-          .data$databaseName,
-          .data$temporalChoices,
-          .data$conceptId,
-          .data$mean,
-          .data$sd
+          covariateName,
+          analysisName,
+          databaseName,
+          temporalChoices,
+          conceptId,
+          mean,
+          sd
         ) %>%
         tidyr::pivot_wider(
           id_cols = dplyr::all_of(keyColumns),
@@ -733,7 +744,7 @@ characterizationModule <- function(id,
           values_from = "mean",
           names_sep = "_"
         ) %>%
-        dplyr::relocate(dplyr::all_of(c(keyColumns, temporalChoices))) %>%
+        dplyr::relocate(dplyr::all_of(c(keyColumns, temporalChoicesVar))) %>%
         dplyr::arrange(dplyr::desc(dplyr::across(dplyr::starts_with("T ("))))
 
       if (any(stringr::str_detect(
@@ -743,7 +754,7 @@ characterizationModule <- function(id,
         data <- data %>%
           dplyr::arrange(dplyr::desc(dplyr::across(dplyr::starts_with("T (0"))))
       }
-      dataColumns <- temporalChoices
+      dataColumns <- temporalChoicesVar
       progress$set(
         message = "Rendering table",
         value = 80
@@ -753,7 +764,7 @@ characterizationModule <- function(id,
         data = data,
         keyColumns = keyColumns,
         dataColumns = dataColumns,
-        showDataAsPercent = FALSE,
+        showDataAsPercent = showAsPercentage,
         pageSize = 100
       )
     })
diff --git a/inst/shiny/DiagnosticsExplorer/R/CohortCountsModule.R b/inst/shiny/DiagnosticsExplorer/R/CohortCountsModule.R
index 979a43923..1ae6e7180 100644
--- a/inst/shiny/DiagnosticsExplorer/R/CohortCountsModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/CohortCountsModule.R
@@ -14,8 +14,8 @@ getColumnMax <- function(data, string) {
   data <- data %>%
     dplyr::select(dplyr::all_of(string)) %>%
     tidyr::pivot_longer(values_to = "value", cols = dplyr::everything()) %>%
-    dplyr::filter(!is.na(.data$value)) %>%
-    dplyr::pull(.data$value)
+    dplyr::filter(!is.na(value)) %>%
+    dplyr::pull(value)
 
   if (!hasData(data)) {
     return(0)
@@ -158,8 +158,8 @@ cohortCountsModule <- function(id,
       }
 
       data <- data %>%
-        dplyr::inner_join(cohortTable %>% dplyr::select(.data$cohortName, .data$cohortId), by = "cohortId") %>%
-        dplyr::arrange(.data$cohortId, .data$databaseId)
+        dplyr::inner_join(cohortTable %>% dplyr::select(cohortName, cohortId), by = "cohortId") %>%
+        dplyr::arrange(cohortId, databaseId)
 
       return(data)
     })
@@ -173,8 +173,8 @@ cohortCountsModule <- function(id,
 
       data <- getResults() %>%
         dplyr::rename(
-          persons = .data$cohortSubjects,
-          records = .data$cohortEntries
+          persons = cohortSubjects,
+          records = cohortEntries
         )
 
       dataColumnFields <- c("persons", "records")
@@ -219,7 +219,7 @@ cohortCountsModule <- function(id,
         if (hasData(getResults())) {
           subset <- getResults() %>%
             dplyr::select(
-              .data$cohortId
+              cohortId
             ) %>%
             dplyr::distinct()
           subset <- subset[idx,]
@@ -274,26 +274,26 @@ cohortCountsModule <- function(id,
       if (all(hasData(showDataAsPercent), showDataAsPercent)) {
         data <- data %>%
           dplyr::mutate(
-            Meet = .data$meetSubjects / .data$totalSubjects,
-            Gain = .data$gainSubjects / .data$totalSubjects,
-            Remain = .data$remainSubjects / .data$totalSubjects,
-            id = .data$ruleSequenceId
+            Meet = meetSubjects / totalSubjects,
+            Gain = gainSubjects / totalSubjects,
+            Remain = remainSubjects / totalSubjects,
+            id = ruleSequenceId
           )
       } else {
         data <- data %>%
           dplyr::mutate(
-            Meet = .data$meetSubjects,
-            Gain = .data$gainSubjects,
-            Remain = .data$remainSubjects,
-            Total = .data$totalSubjects,
-            id = .data$ruleSequenceId
+            Meet = meetSubjects,
+            Gain = gainSubjects,
+            Remain = remainSubjects,
+            Total = totalSubjects,
+            id = ruleSequenceId
           )
       }
 
       data <- data %>%
-        dplyr::arrange(.data$cohortId,
-                       .data$databaseId,
-                       .data$id)
+        dplyr::arrange(cohortId,
+                       databaseId,
+                       id)
 
       validate(need(
         (nrow(data) > 0),
diff --git a/inst/shiny/DiagnosticsExplorer/R/CohortDefinitionModule.R b/inst/shiny/DiagnosticsExplorer/R/CohortDefinitionModule.R
index 66b23e685..b3abf4497 100644
--- a/inst/shiny/DiagnosticsExplorer/R/CohortDefinitionModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/CohortDefinitionModule.R
@@ -85,21 +85,21 @@ getConceptSetDataFrameFromConceptSetExpression <-
     if ("CONCEPT_ID" %in% colnames(conceptSetExpressionDetails)) {
       if ("isExcluded" %in% colnames(conceptSetExpressionDetails)) {
         conceptSetExpressionDetails <- conceptSetExpressionDetails %>%
-          dplyr::rename(IS_EXCLUDED = .data$isExcluded)
+          dplyr::rename(IS_EXCLUDED = isExcluded)
       } else {
         conceptSetExpressionDetails <- conceptSetExpressionDetails %>%
           dplyr::mutate(IS_EXCLUDED = FALSE)
       }
       if ("includeDescendants" %in% colnames(conceptSetExpressionDetails)) {
         conceptSetExpressionDetails <- conceptSetExpressionDetails %>%
-          dplyr::rename(INCLUDE_DESCENDANTS = .data$includeDescendants)
+          dplyr::rename(INCLUDE_DESCENDANTS = includeDescendants)
       } else {
         conceptSetExpressionDetails <- conceptSetExpressionDetails %>%
           dplyr::mutate(INCLUDE_DESCENDANTS = FALSE)
       }
       if ("includeMapped" %in% colnames(conceptSetExpressionDetails)) {
         conceptSetExpressionDetails <- conceptSetExpressionDetails %>%
-          dplyr::rename(INCLUDE_MAPPED = .data$includeMapped)
+          dplyr::rename(INCLUDE_MAPPED = includeMapped)
       } else {
         conceptSetExpressionDetails <- conceptSetExpressionDetails %>%
           dplyr::mutate(INCLUDE_MAPPED = FALSE)
@@ -133,7 +133,7 @@ getConceptSetDetailsFromCohortDefinition <-
     conceptSetExpression <- expression$ConceptSets %>%
       dplyr::bind_rows() %>%
       dplyr::mutate(json = RJSONIO::toJSON(
-        x = .data$expression,
+        x = expression,
         pretty = TRUE
       ))
 
@@ -147,8 +147,8 @@ getConceptSetDetailsFromCohortDefinition <-
             conceptSetExpression[i,]$expression$items
         ) %>%
           dplyr::mutate(id = conceptSetExpression[i,]$id) %>%
-          dplyr::relocate(.data$id) %>%
-          dplyr::arrange(.data$id)
+          dplyr::relocate(id) %>%
+          dplyr::arrange(id)
     }
     conceptSetExpressionDetails <-
       dplyr::bind_rows(conceptSetExpressionDetails)
@@ -399,7 +399,7 @@ cohortDefinitionsModule <- function(id,
 
     cohortDefinitionTableData <- shiny::reactive(x = {
       data <- cohortDefinitions() %>%
-        dplyr::select(.data$cohortId, .data$cohortName)
+        dplyr::select(cohortId, cohortName)
       return(data)
     })
 
@@ -407,7 +407,7 @@ cohortDefinitionsModule <- function(id,
     output$cohortDefinitionTable <-
       reactable::renderReactable(expr = {
         data <- cohortDefinitionTableData() %>%
-          dplyr::mutate(cohortId = as.character(.data$cohortId))
+          dplyr::mutate(cohortId = as.character(cohortId))
 
         validate(need(hasData(data), "There is no data for this cohort."))
         keyColumns <- c("cohortId", "cohortName")
@@ -479,13 +479,13 @@ cohortDefinitionsModule <- function(id,
           return(NULL)
         }
         data <- data %>%
-          dplyr::filter(.data$cohortId == selectedCohortDefinitionRow()$cohortId) %>%
-          dplyr::filter(.data$databaseId %in% databaseTable$databaseId) %>%
-          dplyr::select(.data$databaseId,
-                        .data$cohortSubjects,
-                        .data$cohortEntries) %>%
-          dplyr::rename("persons" = .data$cohortSubjects,
-                        "events" = .data$cohortEntries)
+          dplyr::filter(cohortId == selectedCohortDefinitionRow()$cohortId) %>%
+          dplyr::filter(databaseId %in% databaseTable$databaseId) %>%
+          dplyr::select(databaseId,
+                        cohortSubjects,
+                        cohortEntries) %>%
+          dplyr::rename("persons" = cohortSubjects,
+                        "events" = cohortEntries)
 
         validate(need(hasData(data), "There is no data for this cohort."))
 
@@ -565,7 +565,7 @@ cohortDefinitionsModule <- function(id,
       if (!is.null(data$conceptSetExpression) &&
         nrow(data$conceptSetExpression) > 0) {
         data <- data$conceptSetExpression %>%
-          dplyr::select(.data$id, .data$name)
+          dplyr::select(id, name)
       } else {
         return(NULL)
       }
@@ -631,23 +631,23 @@ cohortDefinitionsModule <- function(id,
         return(NULL)
       }
       data <- data %>%
-        dplyr::filter(.data$id == cohortDefinitionConceptSetExpressionSelected()$id)
+        dplyr::filter(id == cohortDefinitionConceptSetExpressionSelected()$id)
       if (!hasData(data)) {
         return(NULL)
       }
       data <- data %>%
         dplyr::select(
-          .data$conceptId,
-          .data$conceptName,
-          .data$isExcluded,
-          .data$includeDescendants,
-          .data$includeMapped,
-          .data$standardConcept,
-          .data$invalidReason,
-          .data$conceptCode,
-          .data$domainId,
-          .data$vocabularyId,
-          .data$conceptClassId
+          conceptId,
+          conceptName,
+          isExcluded,
+          includeDescendants,
+          includeMapped,
+          standardConcept,
+          invalidReason,
+          conceptCode,
+          domainId,
+          vocabularyId,
+          conceptClassId
         )
       return(data)
     })
@@ -665,10 +665,10 @@ cohortDefinitionsModule <- function(id,
         }
 
         data <- data %>%
-          dplyr::rename(exclude = .data$isExcluded,
-                        descendants = .data$includeDescendants,
-                        mapped = .data$includeMapped,
-                        invalid = .data$invalidReason)
+          dplyr::rename(exclude = isExcluded,
+                        descendants = includeDescendants,
+                        mapped = includeMapped,
+                        invalid = invalidReason)
         validate(need(
           all(!is.null(data),
               nrow(data) > 0),
@@ -709,9 +709,9 @@ cohortDefinitionsModule <- function(id,
         return(NULL)
       } else {
         data <- cohortCount %>%
-          dplyr::filter(.data$cohortId == row$cohortId) %>%
-          dplyr::filter(.data$databaseId == getDatabaseIdInCohortConceptSet()) %>%
-          dplyr::select(.data$cohortSubjects, .data$cohortEntries)
+          dplyr::filter(cohortId == row$cohortId) %>%
+          dplyr::filter(databaseId == getDatabaseIdInCohortConceptSet()) %>%
+          dplyr::select(cohortSubjects, cohortEntries)
 
         if (nrow(data) == 0) {
           return(NULL)
@@ -780,8 +780,8 @@ cohortDefinitionsModule <- function(id,
           return(NULL)
         }
         databaseIdToFilter <- databaseTable %>%
-          dplyr::filter(.data$databaseIdWithVocabularyVersion == vocabSchema()) %>%
-          dplyr::pull(.data$databaseId)
+          dplyr::filter(databaseIdWithVocabularyVersion == vocabSchema()) %>%
+          dplyr::pull(databaseId)
         if (!hasData(databaseIdToFilter)) {
           return(NULL)
         }
@@ -797,10 +797,10 @@ cohortDefinitionsModule <- function(id,
           paste0("No data for database id ", input$vocabularySchema)
         ))
         data <- data %>%
-          dplyr::filter(.data$conceptSetId == cohortDefinitionConceptSetExpressionSelected()$id) %>%
-          dplyr::filter(.data$databaseId == databaseIdToFilter) %>%
-          dplyr::rename("persons" = .data$conceptSubjects,
-                        "records" = .data$conceptCount)
+          dplyr::filter(conceptSetId == cohortDefinitionConceptSetExpressionSelected()$id) %>%
+          dplyr::filter(databaseId == databaseIdToFilter) %>%
+          dplyr::rename("persons" = conceptSubjects,
+                        "records" = conceptCount)
         validate(need(
           hasData(data),
           paste0("No data for database id ", input$vocabularySchema)
@@ -888,8 +888,8 @@ cohortDefinitionsModule <- function(id,
         }
 
         databaseIdToFilter <- databaseTable %>%
-          dplyr::filter(.data$databaseIdWithVocabularyVersion == vocabSchema()) %>%
-          dplyr::pull(.data$databaseId)
+          dplyr::filter(databaseIdWithVocabularyVersion == vocabSchema()) %>%
+          dplyr::pull(databaseId)
         if (!hasData(databaseIdToFilter)) {
           return(NULL)
         }
@@ -906,10 +906,10 @@ cohortDefinitionsModule <- function(id,
         ))
 
         data <- data %>%
-          dplyr::filter(.data$conceptSetId == cohortDefinitionConceptSetExpressionSelected()$id) %>%
-          dplyr::filter(.data$databaseId == databaseIdToFilter) %>%
-          dplyr::rename("persons" = .data$conceptSubjects,
-                        "records" = .data$conceptCount)
+          dplyr::filter(conceptSetId == cohortDefinitionConceptSetExpressionSelected()$id) %>%
+          dplyr::filter(databaseId == databaseIdToFilter) %>%
+          dplyr::rename("persons" = conceptSubjects,
+                        "records" = conceptCount)
         validate(need(
           hasData(data),
           paste0("No data for database id ", input$vocabularySchema)
diff --git a/inst/shiny/DiagnosticsExplorer/R/CohortOverlapModule.R b/inst/shiny/DiagnosticsExplorer/R/CohortOverlapModule.R
index 7db3c35f6..12e96d3c0 100644
--- a/inst/shiny/DiagnosticsExplorer/R/CohortOverlapModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/CohortOverlapModule.R
@@ -16,44 +16,44 @@ plotCohortOverlap <- function(data,
 
   plotData <- data %>%
     dplyr::mutate(
-      absTOnlySubjects = abs(.data$tOnlySubjects),
-      absCOnlySubjects = abs(.data$cOnlySubjects),
-      absBothSubjects = abs(.data$bothSubjects),
-      absEitherSubjects = abs(.data$eitherSubjects),
-      signTOnlySubjects = dplyr::case_when(.data$tOnlySubjects < 0 ~ "<", TRUE ~ ""),
-      signCOnlySubjects = dplyr::case_when(.data$cOnlySubjects < 0 ~ "<", TRUE ~ ""),
-      signBothSubjects = dplyr::case_when(.data$bothSubjects < 0 ~ "<", TRUE ~ "")
+      absTOnlySubjects = abs(tOnlySubjects),
+      absCOnlySubjects = abs(cOnlySubjects),
+      absBothSubjects = abs(bothSubjects),
+      absEitherSubjects = abs(eitherSubjects),
+      signTOnlySubjects = dplyr::case_when(tOnlySubjects < 0 ~ "<", TRUE ~ ""),
+      signCOnlySubjects = dplyr::case_when(cOnlySubjects < 0 ~ "<", TRUE ~ ""),
+      signBothSubjects = dplyr::case_when(bothSubjects < 0 ~ "<", TRUE ~ "")
     ) %>%
     dplyr::mutate(
       tOnlyString = paste0(
-        .data$signTOnlySubjects,
-        scales::comma(.data$absTOnlySubjects, accuracy = 1),
+        signTOnlySubjects,
+        scales::comma(absTOnlySubjects, accuracy = 1),
         " (",
-        .data$signTOnlySubjects,
-        scales::percent(.data$absTOnlySubjects /
-                          .data$absEitherSubjects,
+        signTOnlySubjects,
+        scales::percent(absTOnlySubjects /
+                          absEitherSubjects,
                         accuracy = 1
         ),
         ")"
       ),
       cOnlyString = paste0(
-        .data$signCOnlySubjects,
-        scales::comma(.data$absCOnlySubjects, accuracy = 1),
+        signCOnlySubjects,
+        scales::comma(absCOnlySubjects, accuracy = 1),
         " (",
-        .data$signCOnlySubjects,
-        scales::percent(.data$absCOnlySubjects /
-                          .data$absEitherSubjects,
+        signCOnlySubjects,
+        scales::percent(absCOnlySubjects /
+                          absEitherSubjects,
                         accuracy = 1
         ),
         ")"
       ),
       bothString = paste0(
-        .data$signBothSubjects,
-        scales::comma(.data$absBothSubjects, accuracy = 1),
+        signBothSubjects,
+        scales::comma(absBothSubjects, accuracy = 1),
         " (",
-        .data$signBothSubjects,
-        scales::percent(.data$absBothSubjects /
-                          .data$absEitherSubjects,
+        signBothSubjects,
+        scales::percent(absBothSubjects /
+                          absEitherSubjects,
                         accuracy = 1
         ),
         ")"
@@ -62,29 +62,29 @@ plotCohortOverlap <- function(data,
     dplyr::mutate(
       tooltip = paste0(
         "Database: ",
-        .data$databaseName,
+        databaseName,
         "\n",
         "\n",
-        .data$targetShortName,
+        targetShortName,
         " only: ",
-        .data$tOnlyString,
+        tOnlyString,
         "\nBoth: ",
-        .data$bothString,
+        bothString,
         "\n",
-        .data$comparatorShortName,
+        comparatorShortName,
         " only: ",
-        .data$cOnlyString
+        cOnlyString
       )
     ) %>%
     dplyr::select(
-      .data$targetShortName,
-      .data$comparatorShortName,
-      .data$databaseId,
-      .data$databaseName,
-      .data$absTOnlySubjects,
-      .data$absCOnlySubjects,
-      .data$absBothSubjects,
-      .data$tooltip
+      targetShortName,
+      comparatorShortName,
+      databaseId,
+      databaseName,
+      absTOnlySubjects,
+      absCOnlySubjects,
+      absBothSubjects,
+      tooltip
     ) %>%
     tidyr::pivot_longer(
       cols = c(
@@ -97,7 +97,7 @@ plotCohortOverlap <- function(data,
     ) %>%
     dplyr::mutate(
       subjectsIn = dplyr::recode(
-        .data$subjectsIn,
+        subjectsIn,
         absTOnlySubjects = "Left cohort only",
         absBothSubjects = "Both cohorts",
         absCOnlySubjects = "Right cohort only"
@@ -117,27 +117,27 @@ plotCohortOverlap <- function(data,
   }
 
   sortTargetShortName <- plotData %>%
-    dplyr::select(.data$targetShortName) %>%
+    dplyr::select(targetShortName) %>%
     dplyr::distinct() %>%
     dplyr::arrange(-as.integer(sub(
-      pattern = "^C", "", x = .data$targetShortName
+      pattern = "^C", "", x = targetShortName
     )))
 
   sortComparatorShortName <- plotData %>%
-    dplyr::select(.data$comparatorShortName) %>%
+    dplyr::select(comparatorShortName) %>%
     dplyr::distinct() %>%
     dplyr::arrange(as.integer(sub(
-      pattern = "^C", "", x = .data$comparatorShortName
+      pattern = "^C", "", x = comparatorShortName
     )))
 
   plotData <- plotData %>%
     dplyr::arrange(
-      targetShortName = factor(.data$targetShortName, levels = sortTargetShortName$targetShortName),
-      .data$targetShortName
+      targetShortName = factor(targetShortName, levels = sortTargetShortName$targetShortName),
+      targetShortName
     ) %>%
     dplyr::arrange(
-      comparatorShortName = factor(.data$comparatorShortName, levels = sortComparatorShortName$comparatorShortName),
-      .data$comparatorShortName
+      comparatorShortName = factor(comparatorShortName, levels = sortComparatorShortName$comparatorShortName),
+      comparatorShortName
     )
 
   plotData$targetShortName <- factor(plotData$targetShortName,
@@ -151,11 +151,11 @@ plotCohortOverlap <- function(data,
 
   plot <- ggplot2::ggplot(data = plotData) +
     ggplot2::aes(
-      fill = .data$subjectsIn,
-      y = .data$targetShortName,
-      x = .data$value,
-      tooltip = .data$tooltip,
-      group = .data$subjectsIn
+      fill = subjectsIn,
+      y = targetShortName,
+      x = value,
+      tooltip = tooltip,
+      group = subjectsIn
     ) +
     ggplot2::ylab(label = "") +
     ggplot2::xlab(label = "") +
@@ -183,7 +183,7 @@ plotCohortOverlap <- function(data,
   height <-
     nrow(
       plotData %>%
-        dplyr::select(.data$targetShortName, .data$comparatorShortName) %>%
+        dplyr::select(targetShortName, comparatorShortName) %>%
         dplyr::distinct()
     )
   plot <- ggiraph::girafe(
@@ -346,32 +346,32 @@ cohortOverlapModule <- function(id,
       ))
 
       data <- data %>%
-        dplyr::inner_join(cohortTable %>% dplyr::select(.data$cohortId,
-                                                        targetCohortName = .data$cohortName),
+        dplyr::inner_join(cohortTable %>% dplyr::select(cohortId,
+                                                        targetCohortName = cohortName),
                           by = c("targetCohortId" = "cohortId")) %>%
-        dplyr::inner_join(cohortTable %>% dplyr::select(.data$cohortId,
-                                                        comparatorCohortName = .data$cohortName),
+        dplyr::inner_join(cohortTable %>% dplyr::select(cohortId,
+                                                        comparatorCohortName = cohortName),
                           by = c("comparatorCohortId" = "cohortId")) %>%
         dplyr::select(
-          .data$databaseName,
-          .data$targetCohortId,
-          .data$targetCohortName,
-          .data$comparatorCohortId,
-          .data$comparatorCohortName,
-          tOnly = .data$tOnlySubjects,
-          cOnly = .data$cOnlySubjects,
-          both = .data$bothSubjects,
-          totalSubjects = .data$eitherSubjects
+          databaseName,
+          targetCohortId,
+          targetCohortName,
+          comparatorCohortId,
+          comparatorCohortName,
+          tOnly = tOnlySubjects,
+          cOnly = cOnlySubjects,
+          both = bothSubjects,
+          totalSubjects = eitherSubjects
         )
 
       if (input$showCohortIds) {
         data <- data %>% dplyr::mutate(
-          targetCohortName = paste0("C", .data$targetCohortId, " - ", .data$targetCohortName),
-          comparatorCohortName = paste0("C", .data$comparatorCohortId, " - ", .data$comparatorCohortName)
+          targetCohortName = paste0("C", targetCohortId, " - ", targetCohortName),
+          comparatorCohortName = paste0("C", comparatorCohortId, " - ", comparatorCohortName)
         )
       }
 
-      data <- data %>% dplyr::select(-.data$targetCohortId, -.data$comparatorCohortId)
+      data <- data %>% dplyr::select(-targetCohortId, -comparatorCohortId)
 
       if (input$showAsPercentage) {
         data$tOnly <- data$tOnly / data$totalSubjects
diff --git a/inst/shiny/DiagnosticsExplorer/R/CompareCharacterizationModule.R b/inst/shiny/DiagnosticsExplorer/R/CompareCharacterizationModule.R
index be36f0939..ba219ebb0 100644
--- a/inst/shiny/DiagnosticsExplorer/R/CompareCharacterizationModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/CompareCharacterizationModule.R
@@ -19,7 +19,7 @@ plotTemporalCompareStandardizedDifference <- function(balance,
   balance$domainId[!balance$domainId %in% domains] <- "Other"
   if (domain != "all") {
     balance <- balance %>%
-      dplyr::filter(.data$domainId == !!domain)
+      dplyr::filter(domainId == !!domain)
   }
   validate(need((nrow(balance) > 0), paste0("No data for selected combination.")))
 
@@ -27,11 +27,11 @@ plotTemporalCompareStandardizedDifference <- function(balance,
   # anything with small mean in both target and comparator:
   if (nrow(balance) > 1000) {
     balance <- balance %>%
-      dplyr::filter(.data$mean1 > 0.01 | .data$mean2 > 0.01)
+      dplyr::filter(mean1 > 0.01 | mean2 > 0.01)
   }
   if (nrow(balance) > 1000) {
     balance <- balance %>%
-      dplyr::filter(.data$sumValue1 > 0 & .data$sumValue2 > 0)
+      dplyr::filter(sumValue1 > 0 & sumValue2 > 0)
   }
 
   balance <- balance %>%
@@ -107,13 +107,13 @@ plotTemporalCompareStandardizedDifference <- function(balance,
     ggplot2::ggplot(
       balance,
       ggplot2::aes(
-        x = .data$mean1,
-        y = .data$mean2,
-        color = .data$domainId
+        x = mean1,
+        y = mean2,
+        color = domainId
       )
     ) +
       ggiraph::geom_point_interactive(
-        ggplot2::aes(tooltip = .data$tooltip),
+        ggplot2::aes(tooltip = tooltip),
         size = 3,
         shape = 16,
         alpha = 0.5
@@ -401,13 +401,13 @@ compareCohortCharacterizationModule <- function(id,
   shiny::moduleServer(id, function(input, output, session) {
     # Temporal choices (e.g. -30d - 0d ) are dynamic to execution
     timeIdOptions <- getResultsTemporalTimeRef(dataSource = dataSource) %>%
-      dplyr::arrange(.data$sequence)
+      dplyr::arrange(sequence)
     shiny::observe({
       # Default time windows
       selectedTimeWindows <- timeIdOptions %>%
-        dplyr::filter(.data$primaryTimeId == 1) %>%
-        dplyr::filter(.data$isTemporal == 1) %>%
-        dplyr::arrange(.data$sequence) %>%
+        dplyr::filter(primaryTimeId == 1) %>%
+        dplyr::filter(isTemporal == 1) %>%
+        dplyr::arrange(sequence) %>%
         dplyr::pull("temporalChoices")
 
       shinyWidgets::updatePickerInput(session,
@@ -444,15 +444,15 @@ compareCohortCharacterizationModule <- function(id,
 
     selectedTimeIds <- shiny::reactive({
       timeIdOptions %>%
-        dplyr::filter(.data$temporalChoices %in% input$timeIdChoices) %>%
-        dplyr::select(.data$timeId) %>%
+        dplyr::filter(temporalChoices %in% input$timeIdChoices) %>%
+        dplyr::select(timeId) %>%
         dplyr::pull()
     })
 
     selectedTimeIdsSingle <- shiny::reactive({
       timeIdOptions %>%
-        dplyr::filter(.data$temporalChoices %in% input$timeIdChoicesSingle) %>%
-        dplyr::select(.data$timeId) %>%
+        dplyr::filter(temporalChoices %in% input$timeIdChoicesSingle) %>%
+        dplyr::select(timeId) %>%
         dplyr::pull()
     })
 
@@ -501,7 +501,7 @@ compareCohortCharacterizationModule <- function(id,
         characterizationAnalysisOptionsUniverse <- analysisNameOptions
         charcterizationAnalysisOptionsSelected <-
           temporalAnalysisRef %>%
-            dplyr::pull(.data$analysisName) %>%
+            dplyr::pull(analysisName) %>%
             unique()
       }
 
@@ -524,7 +524,7 @@ compareCohortCharacterizationModule <- function(id,
         characterizationDomainOptionsUniverse <- domainIdOptions
         charcterizationDomainOptionsSelected <-
           temporalAnalysisRef %>%
-            dplyr::pull(.data$domainId) %>%
+            dplyr::pull(domainId) %>%
             unique()
       }
 
@@ -561,12 +561,12 @@ compareCohortCharacterizationModule <- function(id,
         return(NULL)
       }
       data <- data %>%
-        dplyr::filter(.data$cohortId %in% c(targetCohortId(), comparatorCohortId())) %>%
-        dplyr::filter(.data$databaseId %in% selectedDatabaseIds())
+        dplyr::filter(cohortId %in% c(targetCohortId(), comparatorCohortId())) %>%
+        dplyr::filter(databaseId %in% selectedDatabaseIds())
 
       data <- data %>%
-        dplyr::filter(.data$analysisName %in% input$analysisNameFilter) %>%
-        dplyr::filter(.data$domainId %in% input$domainIdFilter)
+        dplyr::filter(analysisName %in% input$analysisNameFilter) %>%
+        dplyr::filter(domainId %in% input$domainIdFilter)
 
       if (!hasData(data)) {
         return(NULL)
@@ -581,14 +581,14 @@ compareCohortCharacterizationModule <- function(id,
         return(NULL)
       }
       covs1 <- data %>%
-        dplyr::filter(.data$cohortId == targetCohortId(),
-                      .data$databaseId == input$targetDatabase)
+        dplyr::filter(cohortId == targetCohortId(),
+                      databaseId == input$targetDatabase)
       if (!hasData(covs1)) {
         return(NULL)
       }
       covs2 <- data %>%
-        dplyr::filter(.data$cohortId == comparatorCohortId(),
-                      .data$databaseId == input$comparatorDatabase)
+        dplyr::filter(cohortId == comparatorCohortId(),
+                      databaseId == input$comparatorDatabase)
       if (!hasData(covs2)) {
         return(NULL)
       }
@@ -611,59 +611,59 @@ compareCohortCharacterizationModule <- function(id,
       validate(need(hasData(data), "No data available for selected combination."))
       distinctTemporalChoices <- unique(temporalChoices$temporalChoices)
       sortedTemporalChoices <- data %>%
-        dplyr::arrange(factor(.data$temporalChoices, levels = distinctTemporalChoices)) %>%
-        dplyr::distinct(.data$temporalChoices) %>%
-        dplyr::pull(.data$temporalChoices)
+        dplyr::arrange(factor(temporalChoices, levels = distinctTemporalChoices)) %>%
+        dplyr::distinct(temporalChoices) %>%
+        dplyr::pull(temporalChoices)
 
       data <- data %>%
-        dplyr::arrange(factor(.data$temporalChoices, levels = sortedTemporalChoices))
+        dplyr::arrange(factor(temporalChoices, levels = sortedTemporalChoices))
 
       data <- data %>%
-        dplyr::filter(.data$timeId == selectedTimeIdsSingle())
+        dplyr::filter(timeId == selectedTimeIdsSingle())
 
       showAsPercent <- FALSE
       if (input$proportionOrContinuous == "Proportion") {
         showAsPercent <- TRUE
         data <- data %>%
-          dplyr::filter(.data$isBinary == "Y")
+          dplyr::filter(isBinary == "Y")
       } else if (input$proportionOrContinuous == "Continuous") {
         data <- data %>%
-          dplyr::filter(.data$isBinary == "N")
+          dplyr::filter(isBinary == "N")
       }
 
       data <- data %>%
         dplyr::rename(
-          "target" = .data$mean1,
-          "sdT" = .data$sd1,
-          "comparator" = .data$mean2,
-          "sdC" = .data$sd2,
-          "StdDiff" = .data$absStdDiff
+          "target" = mean1,
+          "sdT" = sd1,
+          "comparator" = mean2,
+          "sdC" = sd2,
+          "StdDiff" = absStdDiff
         )
 
       if (input$compareCharacterizationColumnFilters == "Mean and Standard Deviation") {
         data <- data %>%
-          dplyr::select(.data$covariateName,
-                        .data$analysisName,
-                        .data$conceptId,
-                        .data$target,
-                        .data$sdT,
-                        .data$comparator,
-                        .data$sdC,
-                        .data$StdDiff)
+          dplyr::select(covariateName,
+                        analysisName,
+                        conceptId,
+                        target,
+                        sdT,
+                        comparator,
+                        sdC,
+                        StdDiff)
       } else {
         data <- data %>%
-          dplyr::select(.data$covariateName,
-                        .data$analysisName,
-                        .data$conceptId,
-                        .data$target,
-                        .data$comparator,
-                        .data$StdDiff)
+          dplyr::select(covariateName,
+                        analysisName,
+                        conceptId,
+                        target,
+                        comparator,
+                        StdDiff)
       }
 
       # Covariates where stdDiff is NA or NULL
       if (input$showOnlyMutualCovariates) {
-        data <- data %>% dplyr::filter(!is.na(.data$StdDiff),
-                                       !is.null(.data$StdDiff))
+        data <- data %>% dplyr::filter(!is.na(StdDiff),
+                                       !is.null(StdDiff))
       }
 
       reactable::reactable(
@@ -725,13 +725,13 @@ compareCohortCharacterizationModule <- function(id,
     selectionsOutput <- shiny::reactive({
 
       target <- paste(cohortTable %>%
-                        dplyr::filter(.data$cohortId == targetCohortId()) %>%
-                        dplyr::select(.data$cohortName) %>%
+                        dplyr::filter(cohortId == targetCohortId()) %>%
+                        dplyr::select(cohortName) %>%
                         dplyr::pull(),
                       collapse = ", ")
       comparator <- paste(cohortTable %>%
-                            dplyr::filter(.data$cohortId == comparatorCohortId()) %>%
-                            dplyr::select(.data$cohortName) %>%
+                            dplyr::filter(cohortId == comparatorCohortId()) %>%
+                            dplyr::select(cohortName) %>%
                             dplyr::pull(),
                           collapse = ", ")
 
@@ -750,15 +750,15 @@ compareCohortCharacterizationModule <- function(id,
             width = 5,
             tags$b("Target Database :"),
             paste(databaseTable %>%
-                    dplyr::filter(.data$databaseId == input$targetDatabase) %>%
-                    dplyr::select(.data$databaseName) %>%
+                    dplyr::filter(databaseId == input$targetDatabase) %>%
+                    dplyr::select(databaseName) %>%
                     dplyr::pull(),
                   collapse = ", "),
             tags$br(),
             tags$b("Comparator Database :"),
             paste(databaseTable %>%
-                    dplyr::filter(.data$databaseId == input$comparatorDatabase) %>%
-                    dplyr::select(.data$databaseName) %>%
+                    dplyr::filter(databaseId == input$comparatorDatabase) %>%
+                    dplyr::select(databaseName) %>%
                     dplyr::pull(),
                   collapse = ", ")
           )
@@ -798,10 +798,10 @@ compareCohortCharacterizationModule <- function(id,
       distinctTemporalChoices <- unique(temporalChoices$temporalChoices)
 
       data <- data %>%
-        dplyr::filter(.data$timeId %in% selectedTimeIds(),
-                      !is.na(.data$stdDiff)) %>%
-        dplyr::arrange(factor(.data$temporalChoices, levels = distinctTemporalChoices)) %>%
-        dplyr::mutate(temporalChoices = factor(.data$temporalChoices, levels = unique(.data$temporalChoices)))
+        dplyr::filter(timeId %in% selectedTimeIds(),
+                      !is.na(stdDiff)) %>%
+        dplyr::arrange(factor(temporalChoices, levels = distinctTemporalChoices)) %>%
+        dplyr::mutate(temporalChoices = factor(temporalChoices, levels = unique(temporalChoices)))
 
       plot <-
         plotTemporalCompareStandardizedDifference(
diff --git a/inst/shiny/DiagnosticsExplorer/R/ConceptsInDataSourceModule.R b/inst/shiny/DiagnosticsExplorer/R/ConceptsInDataSourceModule.R
index 5d0ec65ea..7632e15c8 100644
--- a/inst/shiny/DiagnosticsExplorer/R/ConceptsInDataSourceModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/ConceptsInDataSourceModule.R
@@ -118,16 +118,16 @@ conceptsInDataSourceModule <- function(id,
       output <- c()
       if (hasData(resolved)) {
         resolved <- resolved %>%
-          dplyr::filter(.data$databaseId %in% selectedDatabaseIds()) %>%
-          dplyr::filter(.data$cohortId %in% targetCohortId()) %>%
-          dplyr::filter(.data$conceptSetId %in% conceptSetIds())
+          dplyr::filter(databaseId %in% selectedDatabaseIds()) %>%
+          dplyr::filter(cohortId %in% targetCohortId()) %>%
+          dplyr::filter(conceptSetId %in% conceptSetIds())
         output <- c(output, resolved$conceptId) %>% unique()
       }
       if (hasData(mapped)) {
         mapped <- mapped %>%
-          dplyr::filter(.data$databaseId %in% selectedDatabaseIds()) %>%
-          dplyr::filter(.data$cohortId %in% targetCohortId()) %>%
-          dplyr::filter(.data$conceptSetId %in% conceptSetIds())
+          dplyr::filter(databaseId %in% selectedDatabaseIds()) %>%
+          dplyr::filter(cohortId %in% targetCohortId()) %>%
+          dplyr::filter(conceptSetId %in% conceptSetIds())
         output <- c(output, mapped$conceptId) %>% unique()
       }
 
@@ -150,7 +150,7 @@ conceptsInDataSourceModule <- function(id,
       if (hasData(selectedConceptSets())) {
         if (length(getFilteredConceptIds()) > 0) {
           data <- data %>%
-            dplyr::filter(.data$conceptId %in% getFilteredConceptIds())
+            dplyr::filter(conceptId %in% getFilteredConceptIds())
         }
       }
       validate(need(
@@ -160,17 +160,17 @@ conceptsInDataSourceModule <- function(id,
 
       if (input$includedType == "Source fields") {
         data <- data %>%
-          dplyr::filter(.data$conceptId > 0) %>%
-          dplyr::filter(.data$sourceConceptId == 1) %>%
-          dplyr::rename(standard = .data$standardConcept)
+          dplyr::filter(conceptId > 0) %>%
+          dplyr::filter(sourceConceptId == 1) %>%
+          dplyr::rename(standard = standardConcept)
         keyColumnFields <-
           c("conceptId", "conceptName", "vocabularyId", "conceptCode")
       }
       if (input$includedType == "Standard fields") {
         data <- data %>%
-          dplyr::filter(.data$conceptId > 0) %>%
-          dplyr::filter(.data$sourceConceptId == 0) %>%
-          dplyr::rename(standard = .data$standardConcept)
+          dplyr::filter(conceptId > 0) %>%
+          dplyr::filter(sourceConceptId == 0) %>%
+          dplyr::rename(standard = standardConcept)
         keyColumnFields <-
           c("conceptId", "conceptName", "vocabularyId")
       }
@@ -178,8 +178,8 @@ conceptsInDataSourceModule <- function(id,
       validate(need(hasData(data), "No data available for selected combination"))
       data <- data %>%
         dplyr::rename(
-          persons = .data$conceptSubjects,
-          records = .data$conceptCount
+          persons = conceptSubjects,
+          records = conceptCount
         ) %>%
         dplyr::arrange(dplyr::desc(abs(dplyr::across(c("records", "persons")))))
 
diff --git a/inst/shiny/DiagnosticsExplorer/R/DatabaseInformationModule.R b/inst/shiny/DiagnosticsExplorer/R/DatabaseInformationModule.R
index 0f4855669..0f2586283 100644
--- a/inst/shiny/DiagnosticsExplorer/R/DatabaseInformationModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/DatabaseInformationModule.R
@@ -47,7 +47,7 @@ databaseInformationModule <- function(id,
   shiny::moduleServer(id, function(input, output, session) {
 
     getDatabaseInformation <- shiny::reactive(x = {
-      return(databaseMetadata %>% dplyr::filter(.data$databaseId %in% selectedDatabaseIds()))
+      return(databaseMetadata %>% dplyr::filter(databaseId %in% selectedDatabaseIds()))
     })
 
     # Output: databaseInformationTable ------------------------
@@ -125,10 +125,10 @@ databaseInformationModule <- function(id,
 
       # The meta-data data structure needs to be taken out!
       data <- data %>%
-        dplyr::mutate(startTime = paste0(.data$startTime)) %>%
-        dplyr::mutate(startTime = as.POSIXct(.data$startTime))
+        dplyr::mutate(startTime = paste0(startTime)) %>%
+        dplyr::mutate(startTime = as.POSIXct(startTime))
 
-      data <- data %>% dplyr::filter(.data$startTime == dbInfo$startTime)
+      data <- data %>% dplyr::filter(startTime == dbInfo$startTime)
       return(data)
     })
 
@@ -178,7 +178,7 @@ databaseInformationModule <- function(id,
         }
 
         data <- data %>%
-          dplyr::pull(.data$packageDependencySnapShotJson)
+          dplyr::pull(packageDependencySnapShotJson)
 
         data <- dplyr::as_tibble(RJSONIO::fromJSON(
           content = data,
@@ -201,7 +201,7 @@ databaseInformationModule <- function(id,
           return(NULL)
         }
         data <- data %>%
-          dplyr::pull(.data$argumentsAtDiagnosticsInitiationJson) %>%
+          dplyr::pull(argumentsAtDiagnosticsInitiationJson) %>%
           RJSONIO::fromJSON(digits = 23) %>%
           RJSONIO::toJSON(
             digits = 23,
diff --git a/inst/shiny/DiagnosticsExplorer/R/DiagnosticsExplorerModule.R b/inst/shiny/DiagnosticsExplorer/R/DiagnosticsExplorerModule.R
index 3b70b595c..cebe87866 100644
--- a/inst/shiny/DiagnosticsExplorer/R/DiagnosticsExplorerModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/DiagnosticsExplorerModule.R
@@ -70,7 +70,7 @@ diagnosticsExplorerModule <- function(id = "DiagnosticsExplorer",
                   )
                 }
                 userCredentialsFiltered <- userCredentials %>%
-                  dplyr::filter(.data$userId == input$userName)
+                  dplyr::filter(userId == input$userName)
                 if (nrow(userCredentialsFiltered) > 0) {
                   passwordHash <-
                     digest::digest(input$password, algo = "sha512")
@@ -177,9 +177,9 @@ diagnosticsExplorerModule <- function(id = "DiagnosticsExplorer",
     # conceptSetIds ----
     conceptSetIds <- shiny::reactive(x = {
       conceptSetsFiltered <- conceptSets %>%
-        dplyr::filter(.data$conceptSetName %in% selectedConceptSets()) %>%
-        dplyr::filter(.data$cohortId %in% targetCohortId()) %>%
-        dplyr::select(.data$conceptSetId) %>%
+        dplyr::filter(conceptSetName %in% selectedConceptSets()) %>%
+        dplyr::filter(cohortId %in% targetCohortId()) %>%
+        dplyr::select(conceptSetId) %>%
         dplyr::pull() %>%
         unique()
       return(conceptSetsFiltered)
@@ -231,8 +231,8 @@ diagnosticsExplorerModule <- function(id = "DiagnosticsExplorer",
         !is.null(input$tabs) & !is.null(envir$temporalCharacterizationTimeIdChoices)) {
         selectedTemporalTimeIds(
           envir$temporalCharacterizationTimeIdChoices %>%
-            dplyr::filter(.data$temporalChoices %in% input$timeIdChoices) %>%
-            dplyr::pull(.data$timeId) %>%
+            dplyr::filter(temporalChoices %in% input$timeIdChoices) %>%
+            dplyr::pull(timeId) %>%
             unique() %>%
             sort()
         )
@@ -241,7 +241,7 @@ diagnosticsExplorerModule <- function(id = "DiagnosticsExplorer",
 
     cohortSubset <- shiny::reactive({
       return(cohortTable %>%
-               dplyr::arrange(.data$cohortId))
+               dplyr::arrange(cohortId))
     })
 
     shiny::observe({
@@ -347,8 +347,8 @@ diagnosticsExplorerModule <- function(id = "DiagnosticsExplorer",
       }
 
       jsonExpression <- cohortSubset() %>%
-        dplyr::filter(.data$cohortId == targetCohortId()) %>%
-        dplyr::select(.data$json)
+        dplyr::filter(cohortId == targetCohortId()) %>%
+        dplyr::select(json)
       jsonExpression <-
         RJSONIO::fromJSON(jsonExpression$json, digits = 23)
       expression <-
@@ -358,7 +358,7 @@ diagnosticsExplorerModule <- function(id = "DiagnosticsExplorer",
       }
 
       expression <- expression$conceptSetExpression %>%
-        dplyr::select(.data$name)
+        dplyr::select(name)
       return(expression)
     })
 
@@ -376,9 +376,9 @@ diagnosticsExplorerModule <- function(id = "DiagnosticsExplorer",
 
     selectedCohorts <- shiny::reactive({
       cohorts <- cohortSubset() %>%
-        dplyr::filter(.data$cohortId %in% cohortIds()) %>%
-        dplyr::arrange(.data$cohortId) %>%
-        dplyr::select(.data$compoundName)
+        dplyr::filter(cohortId %in% cohortIds()) %>%
+        dplyr::arrange(cohortId) %>%
+        dplyr::select(compoundName)
       return(apply(cohorts, 1, function(x) {
         tags$tr(lapply(x, tags$td))
       }))
@@ -411,7 +411,7 @@ diagnosticsExplorerModule <- function(id = "DiagnosticsExplorer",
     if ("orphanConcept" %in% enabledTabs) {
       orphanConceptsModule("orphanConcepts",
                            dataSource = dataSource,
-                           selectedCohorts = selectedCohort,
+                           selectedCohort = selectedCohort,
                            selectedDatabaseIds = selectedDatabaseIds,
                            targetCohortId = targetCohortId,
                            selectedConceptSets = selectedConceptSets,
diff --git a/inst/shiny/DiagnosticsExplorer/R/FacetNested.R b/inst/shiny/DiagnosticsExplorer/R/FacetNested.R
deleted file mode 100644
index b4887c445..000000000
--- a/inst/shiny/DiagnosticsExplorer/R/FacetNested.R
+++ /dev/null
@@ -1,696 +0,0 @@
-# Code borrowed from https://github.com/teunbrand/ggh4x , just to merge the labels of grouped facets.
-# May need to simplify a bit.
-# library(ggplot2)
-
-.grab_ggplot_internals <- function() {
-  objects <- c(
-    ".all_aesthetics",
-    "as_facets_list",
-    "as_gg_data_frame",
-    "axis_label_element_overrides",
-    "check_aesthetics",
-    "check_labeller",
-    "check_subclass",
-    "compact",
-    "continuous_range",
-    "convertInd",
-    "df.grid",
-    "draw_axis_labels",
-    "reshape_add_margins",
-    "new_data_frame",
-    "defaults",
-    "id",
-    "empty",
-    "eval_facets",
-    "ggname",
-    "rename_aes",
-    "mapped_aesthetics",
-    "make_labels",
-    "grid_as_facets_list",
-    "is.zero",
-    "rbind_dfs",
-    "sanitise_dim",
-    "set_draw_key",
-    "snake_class",
-    "ulevels",
-    "unique_combs",
-    "var_list",
-    "validate_mapping",
-    "warn_for_guide_position",
-    "weave_tables_col",
-    "weave_tables_row",
-    "wrap_as_facets_list",
-    ".pt"
-  )
-  objects <- setNames(objects, objects)
-  out <- lapply(objects, function(i) {
-    getFromNamespace(i, "ggplot2")
-  })
-}
-
-# Store the needed ggplot internals here
-.int <- .grab_ggplot_internals()
-
-label_value <- function(labels, multi_line = TRUE) {
-  labels <- lapply(labels, as.character)
-  if (multi_line) {
-    labels
-  } else {
-    collapse_labels_lines(labels)
-  }
-}
-
-# Main function -----------------------------------------------------------
-
-#' @title Layout panels in a grid with nested strips
-#'
-#' @description \code{facet_nested()} forms a matrix of panels defined by row
-#'   and column faceting variables and nests grouped facets.
-#'
-#' @inheritParams ggplot2::facet_grid
-#' @param nest_line a \code{logical} vector of length 1, indicating whether to
-#'   draw a nesting line to indicate the nesting of variables. Control the look
-#'   of the nesting line by setting the \code{ggh4x.facet.nestline} theme
-#'   element.
-#' @param resect  a \code{unit} vector of length 1, indicating how much the
-#'   nesting line should be shortened.
-#' @param bleed a \code{logical} vector of length 1, indicating whether merging
-#'   of lower-level variables is allowed when the higher-level variables are
-#'   separate. See details.
-#'
-#' @details Unlike \code{facet_grid()}, this function only automatically expands
-#'   missing variables when they have no variables in that direction, to allow
-#'   for unnested variables. It still requires at least one layer to have all
-#'   faceting variables.
-#'
-#'   Hierarchies are inferred from the order of variables supplied to
-#'   \code{rows} or \code{cols}. The first variable is interpreted to be the
-#'   outermost variable, while the last variable is interpreted to be the
-#'   innermost variable. They display order is always such that the outermost
-#'   variable is placed the furthest away from the panels. Strips are
-#'   automatically grouped when they span a nested variable.
-#'
-#'   The \code{bleed} argument controls whether lower-level variables are allowed
-#'   to be merged when higher-level are different, i.e. they can bleed over
-#'   hierarchies. Suppose the \code{facet_grid()} behaviour would be the
-#'   following:
-#'
-#'   \code{[_1_][_2_][_2_]} \cr \code{[_3_][_3_][_4_]}
-#'
-#'   In such case, the default \code{bleed = FALSE} argument would result in the
-#'   following:
-#'
-#'   \code{[_1_][___2____]} \cr \code{[_3_][_3_][_4_]}
-#'
-#'   Whereas \code{bleed = TRUE} would allow the following:
-#'
-#'   \code{[_1_][___2____]} \cr \code{[___3____][_4_]}
-#'
-#' @export
-#'
-#' @return A \emph{FacetNested} ggproto object.
-#' @family facetting functions
-#'
-#' @seealso See \code{\link[ggplot2]{facet_grid}} for descriptions of the
-#'   original arguments. See \code{\link[grid]{unit}} for the construction of a
-#'   \code{unit} vector.
-#'
-#' @examples
-#' df <- iris
-#' df$nester <- ifelse(df$Species == "setosa",
-#'   "Short Leaves",
-#'   "Long Leaves"
-#' )
-#'
-#' ggplot(df, aes(Sepal.Length, Petal.Length)) +
-#'   geom_point() +
-#'   facet_nested(~ nester + Species)
-#'
-#' # Controlling the nest line
-#' ggplot(df, aes(Sepal.Length, Petal.Length)) +
-#'   geom_point() +
-#'   facet_nested(~ nester + Species, nest_line = TRUE) +
-#'   theme(ggh4x.facet.nestline = element_line(linetype = 3))
-facet_nested <- function(rows = NULL,
-                         cols = NULL,
-                         scales = "fixed",
-                         space = "fixed",
-                         shrink = TRUE,
-                         labeller = "label_value",
-                         as.table = TRUE,
-                         switch = NULL,
-                         drop = TRUE,
-                         margins = FALSE,
-                         facets = NULL,
-                         nest_line = FALSE,
-                         resect = ggplot2::unit(0, "mm"),
-                         bleed = FALSE) {
-  if (!is.null(facets)) {
-    rows <- facets
-  }
-  if (is.logical(cols)) {
-    margins <- cols
-    cols <- NULL
-  }
-  scales <-
-    match.arg(scales, c("fixed", "free_x", "free_y", "free"))
-  free <- list(
-    x = any(scales %in% c("free_x", "free")),
-    y = any(scales %in% c("free_y", "free"))
-  )
-
-  space <- match.arg(space, c("fixed", "free_x", "free_y", "free"))
-  space_free <- list(
-    x = any(space %in% c("free_x", "free")),
-    y = any(space %in% c("free_y", "free"))
-  )
-
-  if (!is.null(switch) && !switch %in% c("both", "x", "y")) {
-    stop("switch must be either 'both', 'x', or 'y'", call. = FALSE)
-  }
-
-  facets_list <- .int$grid_as_facets_list(rows, cols)
-  n <- length(facets_list)
-  if (n > 2L) {
-    stop("A grid facet specification can't have more than two dimensions",
-      .call = FALSE
-    )
-  }
-  if (n == 1L) {
-    rows <- ggplot2::quos()
-    cols <- facets_list[[1]]
-  } else {
-    rows <- facets_list[[1]]
-    cols <- facets_list[[2]]
-  }
-  labeller <- .int$check_labeller(labeller)
-  ggplot2::ggproto(
-    NULL,
-    FacetNested,
-    shrink = shrink,
-    params = list(
-      rows = rows,
-      cols = cols,
-      margins = margins,
-      free = free,
-      space_free = space_free,
-      labeller = labeller,
-      as.table = as.table,
-      switch = switch,
-      drop = drop,
-      nest_line = nest_line,
-      resect = resect,
-      bleed = bleed
-    )
-  )
-}
-
-# ggproto -----------------------------------------------------------------
-
-#' @usage NULL
-#' @format NULL
-#' @export
-#' @rdname ggh4x_extensions
-FacetNested <- ggplot2::ggproto(
-  "FacetNested",
-  ggplot2::FacetGrid,
-  map_data = function(data, layout, params) {
-    # Handle empty data
-    if (.int$empty(data)) {
-      return(cbind(data, PANEL = integer(0)))
-    }
-    # Setup variables
-    rows <- params$rows
-    cols <- params$cols
-
-    vars <- c(names(rows), names(cols))
-    if (length(vars) == 0) {
-      data$PANEL <- layout$PANEL
-      return(data)
-    }
-
-    margin_vars <- list(
-      intersect(names(rows), names(data)),
-      intersect(names(cols), names(data))
-    )
-
-    # Add variables
-    data <-
-      .int$reshape_add_margins(data, margin_vars, params$margins)
-    facet_vals <-
-      .int$eval_facets(c(rows, cols), data, params$.possible_columns)
-
-    # Only set as missing if it has no variable in that direction
-    missing_facets <- character(0)
-    if (!any(names(rows) %in% names(facet_vals))) {
-      missing_facets <- c(
-        missing_facets,
-        setdiff(names(rows), names(facet_vals))
-      )
-    }
-    if (!any(names(cols) %in% names(facet_vals))) {
-      missing_facets <- c(
-        missing_facets,
-        setdiff(names(cols), names(facet_vals))
-      )
-    }
-
-    # Fill in missing values
-    if (length(missing_facets) > 0) {
-      to_add <- unique(layout[missing_facets])
-      data_rep <- rep.int(1:nrow(data), nrow(to_add))
-      facet_rep <- rep(1:nrow(to_add), each = nrow(data))
-      data <- data[data_rep, , drop = FALSE]
-      rownames(data) <- NULL
-      facet_vals <- cbind(
-        facet_vals[data_rep, , drop = FALSE],
-        to_add[facet_rep, , drop = FALSE]
-      )
-      rownames(facet_vals) <- NULL
-    }
-
-    # Match columns to facets
-    if (nrow(facet_vals) == 0) {
-      data$PANEL <- -1
-    } else {
-      facet_vals[] <- lapply(facet_vals[], as.factor)
-      facet_vals[] <- lapply(facet_vals[], addNA, ifany = TRUE)
-      keys <- plyr::join.keys(facet_vals, layout,
-        by = vars[vars %in% names(facet_vals)]
-      )
-      data$PANEL <- layout$PANEL[match(keys$x, keys$y)]
-    }
-    data
-  },
-  compute_layout = function(data, params) {
-    rows <- params$rows
-    cols <- params$cols
-    dups <- intersect(names(rows), names(cols))
-
-    if (length(dups) > 0) {
-      stop(
-        "Facetting variables can only appear in row or cols, not both.\n",
-        "Problems: ",
-        paste0(dups, collapse = "'"),
-        call. = FALSE
-      )
-    }
-
-    base_rows <- combine_nested_vars(data, params$plot_env,
-      rows,
-      drop = params$drop
-    )
-    if (!params$as.table) {
-      rev_order <- function(x) {
-        factor(x, levels = rev(.int$ulevels(x)))
-      }
-    }
-    base_cols <- combine_nested_vars(data, params$plot_env, cols,
-      drop = params$drop
-    )
-    base <- .int$df.grid(base_rows, base_cols)
-
-    if (nrow(base) == 0) {
-      return(.int$new_data_frame(list(
-        PANEL = 1L,
-        ROW = 1L,
-        COL = 1L,
-        SCALE_X = 1L,
-        SCALE_Y = 1L
-      )))
-    }
-
-    base <-
-      .int$reshape_add_margins(base, list(names(rows), names(cols)), params$margins)
-    base <- unique(base)
-
-    panel <- .int$id(base, drop = TRUE)
-    panel <- factor(panel, levels = seq_len(attr(panel, "n")))
-
-    rows <- if (!length(names(rows))) {
-      rep(1L, length(panel))
-    } else {
-      .int$id(base[names(rows)], drop = TRUE)
-    }
-    cols <- if (!length(names(cols))) {
-      rep(1L, length(panel))
-    } else {
-      .int$id(base[names(cols)], drop = TRUE)
-    }
-
-    panels <- .int$new_data_frame(c(list(
-      PANEL = panel, ROW = rows, COL = cols
-    ), base))
-    panels <- panels[order(panels$PANEL), , drop = FALSE]
-    rownames(panels) <- NULL
-    panels$SCALE_X <- if (params$free$x) {
-      panels$COL
-    } else {
-      1L
-    }
-    panels$SCALE_Y <- if (params$free$y) {
-      panels$ROW
-    } else {
-      1L
-    }
-    panels
-  },
-  draw_panels = function(panels,
-                         layout,
-                         x_scales,
-                         y_scales,
-                         ranges,
-                         coord,
-                         data,
-                         theme,
-                         params) {
-    panel_table <-
-      ggplot2::FacetGrid$draw_panels(
-        panels,
-        layout,
-        x_scales,
-        y_scales,
-        ranges,
-        coord,
-        data,
-        theme,
-        params
-      )
-
-    # Setup strips
-    col_vars <- unique(layout[names(params$cols)])
-    row_vars <- unique(layout[names(params$rows)])
-    attr(col_vars, "type") <- "cols"
-    attr(col_vars, "facet") <- "grid"
-    attr(row_vars, "type") <- "rows"
-    attr(row_vars, "facet") <- "grid"
-
-    # Build strips
-    switch_x <-
-      !is.null(params$switch) && params$switch %in% c("both", "x")
-    switch_y <-
-      !is.null(params$switch) && params$switch %in% c("both", "y")
-
-    # Merging strips
-    merge_cols <-
-      apply(col_vars, 2, function(x) {
-        any(rle(x)$lengths > 1)
-      })
-    merge_rows <-
-      apply(row_vars, 2, function(x) {
-        any(rle(x)$lengths > 1)
-      })
-
-    if (any(merge_cols)) {
-      if (switch_x) {
-        panel_table <- merge_strips(
-          panel_table,
-          col_vars, switch_x, params, theme, "b"
-        )
-      } else {
-        panel_table <- merge_strips(
-          panel_table,
-          col_vars, switch_x, params, theme, "t"
-        )
-      }
-    }
-
-    if (any(merge_rows)) {
-      if (switch_y) {
-        panel_table <- merge_strips(
-          panel_table,
-          row_vars, switch_y, params, theme, "l"
-        )
-      } else {
-        panel_table <- merge_strips(
-          panel_table,
-          row_vars, switch_y, params, theme, "r"
-        )
-      }
-    }
-    panel_table
-  }
-)
-
-# Helper functions -----------------------------------------------
-
-combine_nested_vars <- function(data,
-                                env = emptyenv(),
-                                vars = NULL,
-                                drop = TRUE) {
-  if (length(vars) == 0) {
-    return(.int$new_data_frame())
-  }
-
-  possible_columns <- unique(unlist(lapply(data, names)))
-
-  values <-
-    .int$compact(lapply(
-      data,
-      .int$eval_facets,
-      facets = vars,
-      possible_columns = possible_columns
-    ))
-  has_all <- unlist(lapply(values, length)) == length(vars)
-  if (!any(has_all)) {
-    missing <-
-      lapply(values, function(x) {
-        setdiff(names(vars), names(x))
-      })
-    missing_txt <- vapply(missing, .int$var_list, character(1))
-    name <- c("Plot", paste0("Layer ", seq_len(length(data) - 1)))
-    stop(
-      "At least one layer must contain all faceting variables: ",
-      .int$var_list(names(vars)),
-      ".\n",
-      paste0("* ", name, " is missing ",
-        missing_txt,
-        collapse = "\n"
-      ),
-      call. = FALSE
-    )
-  }
-  base <- unique(.int$rbind_dfs(values[has_all]))
-  if (!drop) {
-    base <- .int$unique_combs(base)
-  }
-  for (value in values[!has_all]) {
-    if (.int$empty(value)) {
-      next
-    }
-    old <- base[setdiff(names(base), names(value))]
-    new <- unique(value[intersect(names(base), names(value))])
-    if (drop) {
-      new <- .int$unique_combs(new)
-    }
-    old[setdiff(names(base), names(value))] <- rep("", nrow(old))
-    base <- rbind(base, .int$df.grid(old, new))
-  }
-  if (.int$empty(base)) {
-    stop("Facetting variables must have at least one value",
-      call. = FALSE
-    )
-  }
-  base
-}
-
-# New merge strips --------------------------------------------------------
-
-merge_strips <- function(panel_table,
-                         vars,
-                         switch,
-                         params,
-                         theme,
-                         where = "t") {
-  orient <- if (where %in% c("t", "b")) {
-    "x"
-  } else {
-    "y"
-  }
-  nlevels <- ncol(vars)
-
-  these_strips <-
-    grep(paste0("strip-", where), panel_table$layout$name)
-  strp_rows <- range(panel_table$layout$t[these_strips])
-  strp_cols <- range(panel_table$layout$l[these_strips])
-  strp_rows <- seq(strp_rows[1], strp_rows[2])
-  strp_cols <- seq(strp_cols[1], strp_cols[2])
-  strp <- panel_table[strp_rows, strp_cols]
-
-  # Make empty template
-  template <- strp
-  template$grobs <- list()
-  template$layout <- template$layout[0, ]
-
-  # Inflate strips
-  for (i in seq_along(strp$grobs)) {
-    sub <- strp$grobs[[i]]
-    if (where == "b") {
-      sub$layout$t <- rev(sub$layout$t)
-      sub$layout$b <- rev(sub$layout$b)
-    }
-    n <- length(sub$grobs)
-    lay <- strp$layout[i, ]
-    lay <- lay[rep(1, n), ]
-    rownames(lay) <- NULL
-    sub <- lapply(seq_len(n), function(j) {
-      x <- sub
-      x$grobs <- x$grobs[j]
-      x$layout <- x$layout[j, ]
-      x
-    })
-    template <- gtable::gtable_add_grob(
-      template,
-      sub,
-      t = lay$t,
-      l = lay$l,
-      b = lay$b,
-      r = lay$r,
-      z = lay$z,
-      clip = lay$clip,
-      name = paste0(lay$name, "-", seq_len(n))
-    )
-  }
-
-  if (!params$bleed) {
-    vars[] <- lapply(seq_len(ncol(vars)), function(i) {
-      do.call(paste0, vars[, seq(i), drop = FALSE])
-    })
-  }
-  merge <- apply(vars, 2, function(x) {
-    any(rle(x)$lengths > 1)
-  })
-
-  if (where == "r") {
-    vars <- rev(vars)
-    merge <- rev(merge)
-  }
-
-  # Abstract away strips
-  strip_ids <- strsplit(template$layout$name, "-", fixed = TRUE)
-  strip_ids <- do.call(rbind, strip_ids)
-  strip_ids <- strip_ids[, 3:ncol(strip_ids)]
-  mode(strip_ids) <- "integer"
-
-  template$layout$delete <- rep(FALSE, nrow(strip_ids))
-  template$layout$aquire <- seq_along(template$grobs)
-
-  for (i in seq_len(nlevels)) {
-    if (!merge[i]) {
-      next()
-    }
-    ii <- strip_ids[, 2] == i
-
-    # Figure out what to merge
-    j <- as.numeric(as.factor(vars[, i]))
-
-    ends <- cumsum(rle(j)$lengths)
-    starts <- c(1, which(diff(j) != 0) + 1)
-
-    # Figure out what strip to remove
-    seqs <- unlist(Map(seq, from = starts, to = ends))
-    delete_this <- seqs[!(seqs %in% starts)]
-    delete_this <- which(strip_ids[, 1] %in% delete_this & ii)
-    template$layout$delete[delete_this] <- TRUE
-
-    # Figure out what cells to expand
-    expand <- seqs[seqs %in% starts]
-    expand <- which(strip_ids[, 1] %in% expand & ii)
-    expand_where <- seqs[seqs %in% ends]
-    expand_where <- which(strip_ids[, 1] %in% expand_where & ii)
-    template$layout$aquire[expand] <-
-      template$layout$aquire[expand_where]
-  }
-
-  # Do expansion
-  if (orient == "x") {
-    template$layout$r <- template$layout$r[template$layout$aquire]
-  } else {
-    template$layout$b <- template$layout$b[template$layout$aquire]
-  }
-
-  # Do deletion
-  template$grobs <- template$grobs[!template$layout$delete]
-  strip_ids <- strip_ids[!template$layout$delete, ]
-  template$layout <- template$layout[!template$layout$delete, ]
-
-  # Add nesting indicator
-  if (params$nest_line) {
-    active <- ggplot2::unit(c(0, 1), "npc") + c(1, -1) * params$resect
-    passive <- if (switch) {
-      c(1, 1)
-    } else {
-      c(0, 0)
-    }
-    nindi <- ggplot2::element_render(theme,
-      "ggh4x.facet.nestline",
-      x = switch(orient,
-        x = active,
-        y = passive
-      ),
-      y = switch(orient,
-        x = passive,
-        y = active
-      )
-    )
-    i <- which(with(template$layout, t != b | l != r))
-    offset <- switch(orient,
-      x = vapply(template$grobs, function(grob) {
-        grob$layout$t
-      }, numeric(1)),
-      y = vapply(template$grobs, function(grob) {
-        grob$layout$l
-      }, numeric(1))
-    )
-    offset <-
-      if (where %in% c("r", "b")) {
-        offset
-      } else {
-        nlevels - offset
-      }
-    template$grobs[i] <- lapply(template$grobs[i], function(grb) {
-      grb <- with(
-        grb$layout,
-        gtable::gtable_add_grob(
-          grb,
-          nindi,
-          t = t,
-          l = l,
-          r = r,
-          b = b,
-          z = z,
-          name = "nester",
-          clip = "off"
-        )
-      )
-    })
-    template$layout$z <- template$layout$z + offset
-  }
-
-  # Delete old strips
-  panel_table <-
-    gtable::gtable_filter(
-      panel_table,
-      paste0("strip-", where),
-      fixed = TRUE,
-      trim = FALSE,
-      invert = TRUE
-    )
-
-  # Place back new strips
-  panel_table <- with(
-    template$layout,
-    gtable::gtable_add_grob(
-      panel_table,
-      template$grobs,
-      t = t - 1 + strp_rows[1],
-      l = l - 1 + strp_cols[1],
-      b = b - 1 + strp_rows[1],
-      r = r - 1 + strp_cols[1],
-      z = z,
-      clip = clip,
-      name = name
-    )
-  )
-  panel_table
-}
diff --git a/inst/shiny/DiagnosticsExplorer/R/IncidenceRatesModule.R b/inst/shiny/DiagnosticsExplorer/R/IncidenceRatesModule.R
index a97eeb7ab..13b0fd4b2 100644
--- a/inst/shiny/DiagnosticsExplorer/R/IncidenceRatesModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/IncidenceRatesModule.R
@@ -64,23 +64,23 @@ plotIncidenceRate <- function(data,
   )
   checkmate::reportAssertions(collection = errorMessage)
 
-  cohortNames <- cohortTable %>% dplyr::select(.data$cohortId,
-                                               .data$cohortName)
+  cohortNames <- cohortTable %>% dplyr::select(cohortId,
+                                               cohortName)
 
   plotData <- data %>%
     dplyr::inner_join(cohortNames, by = "cohortId",) %>%
     addShortName(cohortTable) %>%
-    dplyr::mutate(incidenceRate = round(.data$incidenceRate, digits = 3))
+    dplyr::mutate(incidenceRate = round(incidenceRate, digits = 3))
   plotData <- plotData %>%
     dplyr::mutate(
-      strataGender = !is.na(.data$gender),
-      strataAgeGroup = !is.na(.data$ageGroup),
-      strataCalendarYear = !is.na(.data$calendarYear)
+      strataGender = !is.na(gender),
+      strataAgeGroup = !is.na(ageGroup),
+      strataCalendarYear = !is.na(calendarYear)
     ) %>%
     dplyr::filter(
-      .data$strataGender %in% !!stratifyByGender &
-        .data$strataAgeGroup %in% !!stratifyByAgeGroup &
-        .data$strataCalendarYear %in% !!stratifyByCalendarYear
+      strataGender %in% !!stratifyByGender &
+        strataAgeGroup %in% !!stratifyByAgeGroup &
+        strataCalendarYear %in% !!stratifyByCalendarYear
     ) %>%
     dplyr::select(-dplyr::starts_with("strata"))
 
@@ -113,16 +113,16 @@ plotIncidenceRate <- function(data,
 
 
   sortShortName <- plotData %>%
-    dplyr::select(.data$shortName) %>%
+    dplyr::select(shortName) %>%
     dplyr::distinct() %>%
     dplyr::arrange(as.integer(sub(
-      pattern = "^C", "", x = .data$shortName
+      pattern = "^C", "", x = shortName
     )))
 
   plotData <- plotData %>%
     dplyr::arrange(
-      shortName = factor(.data$shortName, levels = sortShortName$shortName),
-      .data$shortName
+      shortName = factor(shortName, levels = sortShortName$shortName),
+      shortName
     )
 
 
@@ -131,16 +131,16 @@ plotIncidenceRate <- function(data,
 
   if (stratifyByAgeGroup) {
     sortAgeGroup <- plotData %>%
-      dplyr::select(.data$ageGroup) %>%
+      dplyr::select(ageGroup) %>%
       dplyr::distinct() %>%
       dplyr::arrange(as.integer(sub(
-        pattern = "-.+$", "", x = .data$ageGroup
+        pattern = "-.+$", "", x = ageGroup
       )))
 
     plotData <- plotData %>%
       dplyr::arrange(
-        ageGroup = factor(.data$ageGroup, levels = sortAgeGroup$ageGroup),
-        .data$ageGroup
+        ageGroup = factor(ageGroup, levels = sortAgeGroup$ageGroup),
+        ageGroup
       )
 
     plotData$ageGroup <- factor(plotData$ageGroup,
@@ -250,20 +250,20 @@ plotIncidenceRate <- function(data,
     if (stratifyByGender | stratifyByCalendarYear) {
       if (stratifyByAgeGroup) {
         plot <-
-          plot + facet_nested(databaseName + shortName ~ plotData$ageGroup, scales = scales)
+          plot + ggh4x::facet_nested(databaseName + shortName ~ plotData$ageGroup, scales = scales)
       } else {
         plot <-
-          plot + facet_nested(databaseName + shortName ~ ., scales = scales)
+          plot + ggh4x::facet_nested(databaseName + shortName ~ ., scales = scales)
       }
     } else {
       plot <-
-        plot + facet_nested(databaseName + shortName ~ ., scales = scales)
+        plot + ggh4x::facet_nested(databaseName + shortName ~ ., scales = scales)
     }
     # spacing <- rep(c(1, rep(0.5, length(unique(plotData$shortName)) - 1)), length(unique(plotData$databaseId)))[-1]
     spacing <- plotData %>%
-      dplyr::distinct(.data$databaseId, .data$shortName) %>%
-      dplyr::arrange(.data$databaseId) %>%
-      dplyr::group_by(.data$databaseId) %>%
+      dplyr::distinct(databaseId, shortName) %>%
+      dplyr::arrange(databaseId) %>%
+      dplyr::group_by(databaseId) %>%
       dplyr::summarise(count = dplyr::n(), .groups = "keep") %>%
       dplyr::ungroup()
     spacing <-
@@ -287,7 +287,7 @@ plotIncidenceRate <- function(data,
     }
   }
   height <-
-    1.5 + 1 * nrow(dplyr::distinct(plotData, .data$databaseId, .data$shortName))
+    1.5 + 1 * nrow(dplyr::distinct(plotData, databaseId, shortName))
   plot <- ggiraph::girafe(
     ggobj = plot,
     options = list(
@@ -498,8 +498,8 @@ incidenceRatesModule <- function(id,
           minSubjectCount = input$minSubjetCount
         ) %>%
           dplyr::mutate(incidenceRate = dplyr::case_when(
-            .data$incidenceRate < 0 ~ 0,
-            TRUE ~ .data$incidenceRate
+            incidenceRate < 0 ~ 0,
+            TRUE ~ incidenceRate
           ))
       } else {
         data <- NULL
@@ -509,10 +509,10 @@ incidenceRatesModule <- function(id,
 
     shiny::observe({
       ageFilter <- irRanges$ageGroups %>%
-        dplyr::filter(.data$ageGroup != " ", .data$ageGroup != "NA", !is.na(.data$ageGroup)) %>%
+        dplyr::filter(ageGroup != " ", ageGroup != "NA", !is.na(ageGroup)) %>%
         dplyr::distinct() %>%
         dplyr::arrange(as.integer(sub(
-          pattern = "-.+$", "", x = .data$ageGroup
+          pattern = "-.+$", "", x = ageGroup
         )))
 
       shinyWidgets::updatePickerInput(
@@ -527,15 +527,15 @@ incidenceRatesModule <- function(id,
 
     shiny::observe({
       genderFilter <- irRanges$gender %>%
-        dplyr::select(.data$gender) %>%
+        dplyr::select(gender) %>%
         dplyr::filter(
-          .data$gender != "NA",
-          .data$gender != " ",
-          !is.na(.data$gender),
-          !is.null(.data$gender)
+          gender != "NA",
+          gender != " ",
+          !is.na(gender),
+          !is.null(gender)
         ) %>%
         dplyr::distinct() %>%
-        dplyr::arrange(.data$gender)
+        dplyr::arrange(gender)
 
       shinyWidgets::updatePickerInput(
         session = session,
@@ -549,14 +549,14 @@ incidenceRatesModule <- function(id,
 
     shiny::observe({
       calenderFilter <- irRanges$calendarYear %>%
-        dplyr::select(.data$calendarYear) %>%
+        dplyr::select(calendarYear) %>%
         dplyr::filter(
-          .data$calendarYear != " ",
-          .data$calendarYear != "NA",
-          !is.na(.data$calendarYear)
+          calendarYear != " ",
+          calendarYear != "NA",
+          !is.na(calendarYear)
         ) %>%
-        dplyr::distinct(.data$calendarYear) %>%
-        dplyr::arrange(.data$calendarYear)
+        dplyr::distinct(calendarYear) %>%
+        dplyr::arrange(calendarYear)
 
       minValue <- min(calenderFilter$calendarYear)
 
@@ -586,34 +586,34 @@ incidenceRatesModule <- function(id,
 
     incidenceRateCalenderFilter <- shiny::reactive({
       calenderFilter <- incidenceRateData() %>%
-        dplyr::select(.data$calendarYear) %>%
+        dplyr::select(calendarYear) %>%
         dplyr::filter(
-          .data$calendarYear != "NA",
-          !is.na(.data$calendarYear)
+          calendarYear != "NA",
+          !is.na(calendarYear)
         ) %>%
-        dplyr::distinct(.data$calendarYear) %>%
-        dplyr::arrange(.data$calendarYear)
+        dplyr::distinct(calendarYear) %>%
+        dplyr::arrange(calendarYear)
       calenderFilter <-
         calenderFilter[calenderFilter$calendarYear >= input$incidenceRateCalenderFilter[1] &
                          calenderFilter$calendarYear <= input$incidenceRateCalenderFilter[2], , drop = FALSE] %>%
-          dplyr::pull(.data$calendarYear)
+          dplyr::pull(calendarYear)
       return(calenderFilter)
     })
 
 
     incidenceRateYScaleFilter <- shiny::reactive({
       incidenceRateFilter <- incidenceRateData() %>%
-        dplyr::select(.data$incidenceRate) %>%
+        dplyr::select(incidenceRate) %>%
         dplyr::filter(
-          .data$incidenceRate != "NA",
-          !is.na(.data$incidenceRate)
+          incidenceRate != "NA",
+          !is.na(incidenceRate)
         ) %>%
-        dplyr::distinct(.data$incidenceRate) %>%
-        dplyr::arrange(.data$incidenceRate)
+        dplyr::distinct(incidenceRate) %>%
+        dplyr::arrange(incidenceRate)
       incidenceRateFilter <-
         incidenceRateFilter[incidenceRateFilter$incidenceRate >= input$YscaleMinAndMax[1] &
                               incidenceRateFilter$incidenceRate <= input$YscaleMinAndMax[2], , drop = FALSE] %>%
-          dplyr::pull(.data$incidenceRate)
+          dplyr::pull(incidenceRate)
       return(incidenceRateFilter)
     })
 
@@ -639,20 +639,20 @@ incidenceRatesModule <- function(id,
 
         if (stratifyByAge && !"All" %in% input$incidenceRateAgeFilter) {
           data <- data %>%
-            dplyr::filter(.data$ageGroup %in% input$incidenceRateAgeFilter)
+            dplyr::filter(ageGroup %in% input$incidenceRateAgeFilter)
         }
         if (stratifyByGender &&
           !"All" %in% input$incidenceRateGenderFilter) {
           data <- data %>%
-            dplyr::filter(.data$gender %in% input$incidenceRateGenderFilter)
+            dplyr::filter(gender %in% input$incidenceRateGenderFilter)
         }
         if (stratifyByCalendarYear) {
           data <- data %>%
-            dplyr::filter(.data$calendarYear %in% incidenceRateCalenderFilter())
+            dplyr::filter(calendarYear %in% incidenceRateCalenderFilter())
         }
         if (input$irYscaleFixed) {
           data <- data %>%
-            dplyr::filter(.data$incidenceRate %in% incidenceRateYScaleFilter())
+            dplyr::filter(incidenceRate %in% incidenceRateYScaleFilter())
         }
         if (all(!is.null(data), nrow(data) > 0)) {
           plot <- plotIncidenceRate(
diff --git a/inst/shiny/DiagnosticsExplorer/R/InclusionRulesModule.R b/inst/shiny/DiagnosticsExplorer/R/InclusionRulesModule.R
index 15d15a2db..2df211ba0 100644
--- a/inst/shiny/DiagnosticsExplorer/R/InclusionRulesModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/InclusionRulesModule.R
@@ -85,26 +85,26 @@ inclusionRulesModule <- function(id,
       if (showDataAsPercent) {
         table <- table %>%
           dplyr::mutate(
-            Meet = .data$meetSubjects / .data$totalSubjects,
-            Gain = .data$gainSubjects / .data$totalSubjects,
-            Remain = .data$remainSubjects / .data$totalSubjects,
-            id = .data$ruleSequenceId
+            Meet = meetSubjects / totalSubjects,
+            Gain = gainSubjects / totalSubjects,
+            Remain = remainSubjects / totalSubjects,
+            id = ruleSequenceId
           )
       } else {
         table <- table %>%
           dplyr::mutate(
-            Meet = .data$meetSubjects,
-            Gain = .data$gainSubjects,
-            Remain = .data$remainSubjects,
-            Total = .data$totalSubjects,
-            id = .data$ruleSequenceId
+            Meet = meetSubjects,
+            Gain = gainSubjects,
+            Remain = remainSubjects,
+            Total = totalSubjects,
+            id = ruleSequenceId
           )
       }
 
       table <- table %>%
-        dplyr::arrange(.data$cohortId,
-                       .data$databaseId,
-                       .data$id)
+        dplyr::arrange(cohortId,
+                       databaseId,
+                       id)
 
       validate(need(
         (nrow(table) > 0),
diff --git a/inst/shiny/DiagnosticsExplorer/R/IndexEventModule.R b/inst/shiny/DiagnosticsExplorer/R/IndexEventModule.R
index a3e199011..7ccec6356 100644
--- a/inst/shiny/DiagnosticsExplorer/R/IndexEventModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/IndexEventModule.R
@@ -117,9 +117,9 @@ indexEventBreakdownModule <- function(id,
           if (input$indexEventBreakdownTableRadioButton == "All") {
             return(data)
           } else if (input$indexEventBreakdownTableRadioButton == "Standard concepts") {
-            return(data %>% dplyr::filter(.data$standardConcept == "S"))
+            return(data %>% dplyr::filter(standardConcept == "S"))
           } else {
-            return(data %>% dplyr::filter(is.na(.data$standardConcept)))
+            return(data %>% dplyr::filter(is.na(standardConcept)))
           }
         } else {
           return(NULL)
@@ -144,33 +144,33 @@ indexEventBreakdownModule <- function(id,
       ))
 
       data <- data %>%
-        dplyr::arrange(.data$databaseId) %>%
+        dplyr::arrange(databaseId) %>%
         dplyr::select(
-          .data$conceptId,
-          .data$conceptName,
-          .data$domainField,
-          .data$databaseId,
-          .data$vocabularyId,
-          .data$conceptCode,
-          .data$conceptCount,
-          .data$subjectCount,
-          .data$subjectPercent,
-          .data$conceptPercent
+          conceptId,
+          conceptName,
+          domainField,
+          databaseId,
+          vocabularyId,
+          conceptCode,
+          conceptCount,
+          subjectCount,
+          subjectPercent,
+          conceptPercent
         ) %>%
-        dplyr::filter(.data$conceptId > 0) %>%
+        dplyr::filter(conceptId > 0) %>%
         dplyr::distinct()
 
       if (showDataAsPercent) {
         data <- data %>%
           dplyr::rename(
-            persons = .data$subjectPercent,
-            records = .data$conceptPercent
+            persons = subjectPercent,
+            records = conceptPercent
           )
       } else {
         data <- data %>%
           dplyr::rename(
-            persons = .data$subjectCount,
-            records = .data$conceptCount
+            persons = subjectCount,
+            records = conceptCount
           )
       }
 
diff --git a/inst/shiny/DiagnosticsExplorer/R/OrphanConceptsModule.R b/inst/shiny/DiagnosticsExplorer/R/OrphanConceptsModule.R
index 881400938..90628335f 100644
--- a/inst/shiny/DiagnosticsExplorer/R/OrphanConceptsModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/OrphanConceptsModule.R
@@ -56,14 +56,14 @@ orpahanConceptsView <- function(id) {
 
 orphanConceptsModule <- function(id,
                                  dataSource,
-                                 selectedCohorts,
+                                 selectedCohort,
                                  selectedDatabaseIds,
                                  targetCohortId,
                                  selectedConceptSets,
                                  conceptSetIds) {
   ns <- shiny::NS(id)
   shiny::moduleServer(id, function(input, output, session) {
-    output$selectedCohorts <- shiny::renderUI({ selectedCohorts() })
+    output$selectedCohorts <- shiny::renderUI({ selectedCohort() })
 
 
     # Orphan concepts table --------------------
@@ -79,7 +79,7 @@ orphanConceptsModule <- function(id,
         return(NULL)
       }
       data <- data %>%
-        dplyr::arrange(dplyr::desc(.data$conceptCount))
+        dplyr::arrange(dplyr::desc(conceptCount))
       return(data)
     })
     
@@ -94,7 +94,7 @@ orphanConceptsModule <- function(id,
         if (!is.null(selectedConceptSets())) {
           if (length(conceptSetIds()) > 0) {
             data <- data %>%
-              dplyr::filter(.data$conceptSetId %in% conceptSetIds())
+              dplyr::filter(conceptSetId %in% conceptSetIds())
           } else {
             data <- data[0,]
           }
@@ -103,12 +103,12 @@ orphanConceptsModule <- function(id,
 
       if (input$orphanConceptsType == "Standard Only") {
         data <- data %>%
-          dplyr::filter(.data$standardConcept == "S")
+          dplyr::filter(standardConcept == "S")
       } else if (input$orphanConceptsType == "Non Standard Only") {
         data <- data %>%
-          dplyr::filter(is.na(.data$standardConcept) |
+          dplyr::filter(is.na(standardConcept) |
                           (
-                            all(!is.na(.data$standardConcept), .data$standardConcept != "S")
+                            all(!is.na(standardConcept), standardConcept != "S")
                           ))
       }
       
@@ -123,42 +123,42 @@ orphanConceptsModule <- function(id,
 
       data <- data %>%
         dplyr::select(
-          .data$databaseId,
-          .data$cohortId,
-          .data$conceptId,
-          .data$conceptSubjects,
-          .data$conceptCount
+          databaseId,
+          cohortId,
+          conceptId,
+          conceptSubjects,
+          conceptCount
         ) %>%
         dplyr::group_by(
-          .data$databaseId,
-          .data$cohortId,
-          .data$conceptId
+          databaseId,
+          cohortId,
+          conceptId
         ) %>%
         dplyr::summarise(
-          conceptSubjects = sum(.data$conceptSubjects),
-          conceptCount = sum(.data$conceptCount),
+          conceptSubjects = sum(conceptSubjects),
+          conceptCount = sum(conceptCount),
           .groups = "keep"
         ) %>%
         dplyr::ungroup() %>%
         dplyr::arrange(
-          .data$databaseId,
-          .data$cohortId
+          databaseId,
+          cohortId
         ) %>%
         dplyr::inner_join(
           data %>%
             dplyr::select(
-              .data$conceptId,
-              .data$databaseId,
-              .data$cohortId,
-              .data$conceptName,
-              .data$vocabularyId,
-              .data$conceptCode
+              conceptId,
+              databaseId,
+              cohortId,
+              conceptName,
+              vocabularyId,
+              conceptCode
             ),
           by = c("databaseId", "cohortId", "conceptId")
         ) %>%
         dplyr::rename(
-          persons = .data$conceptSubjects,
-          records = .data$conceptCount
+          persons = conceptSubjects,
+          records = conceptCount
         ) %>%
         dplyr::arrange(dplyr::desc(abs(dplyr::across(
           c("records", "persons")
diff --git a/inst/shiny/DiagnosticsExplorer/R/Plots.R b/inst/shiny/DiagnosticsExplorer/R/Plots.R
index 73f2df287..2760123c8 100644
--- a/inst/shiny/DiagnosticsExplorer/R/Plots.R
+++ b/inst/shiny/DiagnosticsExplorer/R/Plots.R
@@ -5,13 +5,13 @@ addShortName <-
            shortNameColumn = "shortName") {
     if (is.null(shortNameRef)) {
       shortNameRef <- data %>%
-        dplyr::distinct(.data$cohortId) %>%
-        dplyr::arrange(.data$cohortId) %>%
+        dplyr::distinct(cohortId) %>%
+        dplyr::arrange(cohortId) %>%
         dplyr::mutate(shortName = paste0("C", dplyr::row_number()))
     }
 
     shortNameRef <- shortNameRef %>%
-      dplyr::distinct(.data$cohortId, .data$shortName)
+      dplyr::distinct(cohortId, shortName)
     colnames(shortNameRef) <- c(cohortIdColumn, shortNameColumn)
     data <- data %>%
       dplyr::inner_join(shortNameRef, by = dplyr::all_of(cohortIdColumn))
@@ -40,18 +40,18 @@ plotCohortComparisonStandardizedDifference <- function(balance,
   balance$domainId[!balance$domainId %in% domains] <- "Other"
   if (domain != "all") {
     balance <- balance %>%
-      dplyr::filter(.data$domainId == !!domain)
+      dplyr::filter(domainId == !!domain)
   }
 
   # Can't make sense of plot with > 1000 dots anyway, so remove
   # anything with small mean in both target and comparator:
   if (nrow(balance) > 1000) {
     balance <- balance %>%
-      dplyr::filter(.data$mean1 > 0.01 | .data$mean2 > 0.01)
+      dplyr::filter(mean1 > 0.01 | mean2 > 0.01)
   }
   if (nrow(balance) > 1000) {
     balance <- balance %>%
-      dplyr::filter(.data$sumValue1 > 0 & .data$sumValue2 > 0)
+      dplyr::filter(sumValue1 > 0 & sumValue2 > 0)
   }
 
   balance <- balance %>%
@@ -127,13 +127,13 @@ plotCohortComparisonStandardizedDifference <- function(balance,
     ggplot2::ggplot(
       balance,
       ggplot2::aes(
-        x = .data$mean1,
-        y = .data$mean2,
-        color = .data$domainId
+        x = mean1,
+        y = mean2,
+        color = domainId
       )
     ) +
     ggiraph::geom_point_interactive(
-      ggplot2::aes(tooltip = .data$tooltip),
+      ggplot2::aes(tooltip = tooltip),
       size = 3,
       shape = 16,
       alpha = 0.5
diff --git a/inst/shiny/DiagnosticsExplorer/R/ResultRetrieval.R b/inst/shiny/DiagnosticsExplorer/R/ResultRetrieval.R
index b74475eda..01e2a676c 100644
--- a/inst/shiny/DiagnosticsExplorer/R/ResultRetrieval.R
+++ b/inst/shiny/DiagnosticsExplorer/R/ResultRetrieval.R
@@ -285,7 +285,7 @@ getCharacterizationOutput <- function(dataSource,
           replacement = ""
         )
       ) %>%
-      dplyr::mutate(covariateName = stringr::str_to_sentence(string = .data$covariateName))
+      dplyr::mutate(covariateName = stringr::str_to_sentence(string = covariateName))
 
     if (!hasData(resultCovariateValue)) {
       return(NULL)
@@ -395,9 +395,9 @@ getTimeDistributionResult <- function(dataSource,
       by = "databaseId"
     ) %>%
     dplyr::rename(
-      "timeMetric" = .data$covariateName,
-      "averageValue" = .data$mean,
-      "standardDeviation" = .data$sd
+      "timeMetric" = covariateName,
+      "averageValue" = mean,
+      "standardDeviation" = sd
     ) %>%
     dplyr::select(
       "cohortId",
@@ -489,24 +489,24 @@ getCohortTemporalRelationshipMatrix <- function(dataSource,
 
   data <- data %>%
     dplyr::select(
-      .data$databaseId,
-      .data$cohortId,
-      .data$comparatorCohortId,
-      .data$startDay,
-      .data$subCsWindowT
+      databaseId,
+      cohortId,
+      comparatorCohortId,
+      startDay,
+      subCsWindowT
     ) %>%
     dplyr::mutate(
       day = dplyr::case_when(
-        .data$startDay < 0 ~ paste0("dm", abs(.data$startDay)),
-        .data$startDay > 0 ~ paste0("dp", abs(.data$startDay)),
-        .data$startDay == 0 ~ paste0("d", abs(.data$startDay))
+        startDay < 0 ~ paste0("dm", abs(startDay)),
+        startDay > 0 ~ paste0("dp", abs(startDay)),
+        startDay == 0 ~ paste0("d", abs(startDay))
       )
     ) %>%
     dplyr::arrange(
-      .data$databaseId,
-      .data$cohortId,
-      .data$comparatorCohortId,
-      .data$startDay
+      databaseId,
+      cohortId,
+      comparatorCohortId,
+      startDay
     ) %>%
     dplyr::distinct() %>%
     tidyr::pivot_wider(
@@ -578,99 +578,99 @@ getResultsCohortCoOccurrenceMatrix <- function(dataSource,
   cohortRelationship <- cohortRelationship %>%
     dplyr::mutate(records = 0) %>%
     dplyr::rename(
-      "targetCohortId" = .data$cohortId,
-      "comparatorCohortId" = .data$comparatorCohortId,
-      "bothSubjects" = .data$subjects,
-      "bothRecords" = .data$records
+      "targetCohortId" = cohortId,
+      "comparatorCohortId" = comparatorCohortId,
+      "bothSubjects" = subjects,
+      "bothRecords" = records
     ) %>%
     dplyr::select(
-      .data$databaseId,
-      .data$targetCohortId,
-      .data$comparatorCohortId,
-      .data$startDay,
-      .data$endDay,
+      databaseId,
+      targetCohortId,
+      comparatorCohortId,
+      startDay,
+      endDay,
       # overlap - comparator period overlaps target period (offset)
-      .data$bothSubjects,
-      .data$bothRecords,
+      bothSubjects,
+      bothRecords,
       # comparator start on Target Start
-      .data$recCsOnTs,
-      .data$subCsOnTs,
-      .data$subCsWindowT
+      recCsOnTs,
+      subCsOnTs,
+      subCsWindowT
     )
 
   coOccurrenceMatrix <- cohortRelationship %>%
-    dplyr::filter(.data$startDay == .data$endDay) %>%
+    dplyr::filter(startDay == endDay) %>%
     dplyr::mutate(dayName = dplyr::case_when(
-      .data$startDay < 0 ~ paste0("dayNeg", abs(.data$startDay)),
-      TRUE ~ paste0("dayPos", abs(.data$startDay))
+      startDay < 0 ~ paste0("dayNeg", abs(startDay)),
+      TRUE ~ paste0("dayPos", abs(startDay))
     )) %>%
     dplyr::select(
-      .data$databaseId,
-      .data$targetCohortId,
-      .data$comparatorCohortId,
-      .data$dayName,
-      .data$bothSubjects,
-      .data$subCsOnTs,
-      .data$subCsWindowT
+      databaseId,
+      targetCohortId,
+      comparatorCohortId,
+      dayName,
+      bothSubjects,
+      subCsOnTs,
+      subCsWindowT
     )
 
   matrixOverlap <- coOccurrenceMatrix %>%
-    dplyr::filter(!is.na(.data$bothSubjects)) %>%
+    dplyr::filter(!is.na(bothSubjects)) %>%
     dplyr::select(
-      .data$databaseId,
-      .data$targetCohortId,
-      .data$comparatorCohortId,
-      .data$dayName,
-      .data$bothSubjects
+      databaseId,
+      targetCohortId,
+      comparatorCohortId,
+      dayName,
+      bothSubjects
     ) %>%
     tidyr::pivot_wider(
       id_cols = c(
-        .data$databaseId,
-        .data$targetCohortId,
-        .data$comparatorCohortId
+        databaseId,
+        targetCohortId,
+        comparatorCohortId
       ),
-      names_from = .data$dayName,
-      values_from = .data$bothSubjects
+      names_from = dayName,
+      values_from = bothSubjects
     ) %>%
     dplyr::mutate(type = "overlap")
 
   matrixStart <- coOccurrenceMatrix %>%
-    dplyr::filter(!is.na(.data$subCsOnTs)) %>%
+    dplyr::filter(!is.na(subCsOnTs)) %>%
     dplyr::select(
-      .data$databaseId,
-      .data$targetCohortId,
-      .data$comparatorCohortId,
-      .data$dayName,
-      .data$subCsOnTs
+      databaseId,
+      targetCohortId,
+      comparatorCohortId,
+      dayName,
+      subCsOnTs
     ) %>%
     tidyr::pivot_wider(
       id_cols = c(
-        .data$databaseId,
-        .data$targetCohortId,
-        .data$comparatorCohortId
+        databaseId,
+        targetCohortId,
+        comparatorCohortId
       ),
-      names_from = .data$dayName,
-      values_from = .data$subCsOnTs
+      names_from = dayName,
+      values_from = subCsOnTs
     ) %>%
     dplyr::mutate(type = "start")
 
   matrixStartWindows <- coOccurrenceMatrix %>%
-    dplyr::filter(!is.na(.data$subCsWindowT)) %>%
+    dplyr::filter(!is.na(subCsWindowT)) %>%
     dplyr::select(
-      .data$databaseId,
-      .data$targetCohortId,
-      .data$comparatorCohortId,
-      .data$dayName,
-      .data$subCsWindowT
+      databaseId,
+      targetCohortId,
+      comparatorCohortId,
+      dayName,
+      subCsWindowT
     ) %>%
     tidyr::pivot_wider(
       id_cols = c(
-        .data$databaseId,
-        .data$targetCohortId,
-        .data$comparatorCohortId
+        databaseId,
+        targetCohortId,
+        comparatorCohortId
       ),
-      names_from = .data$dayName,
-      values_from = .data$subCsWindowT
+      names_from = dayName,
+      values_from = subCsWindowT
     ) %>%
     dplyr::mutate(type = "startWindow")
 
@@ -684,14 +684,14 @@ getResultsCohortCoOccurrenceMatrix <- function(dataSource,
       dplyr::inner_join(
         cohortCount %>%
           dplyr::select(
-            .data$databaseId,
-            .data$cohortId,
-            .data$cohortSubjects
+            databaseId,
+            cohortId,
+            cohortSubjects
           ) %>%
-          dplyr::rename("targetCohortId" = .data$cohortId),
+          dplyr::rename("targetCohortId" = cohortId),
         by = c("targetCohortId", "databaseId")
       ) %>%
-      dplyr::mutate(dplyr::across(.cols = dplyr::starts_with("day")) / .data$cohortSubjects)
+      dplyr::mutate(dplyr::across(.cols = dplyr::starts_with("day")) / cohortSubjects)
   }
   return(matrix)
 }
@@ -746,7 +746,7 @@ getResultsCohortOverlap <- function(dataSource,
   allCombinations <- dplyr::tibble(databaseId = databaseIds) %>%
         tidyr::crossing(dplyr::tibble(cohortId = cohortIds)) %>%
         tidyr::crossing(dplyr::tibble(comparatorCohortId = comparatorCohortIds)) %>%
-        dplyr::filter(.data$comparatorCohortId != .data$cohortId) %>%
+        dplyr::filter(comparatorCohortId != cohortId) %>%
         tidyr::crossing(dplyr::tibble(startDay = c(-9999, 0),
                                       endDay = c(9999, 0)))
 
@@ -756,104 +756,104 @@ getResultsCohortOverlap <- function(dataSource,
     dplyr::mutate(dplyr::across(.cols = where(is.numeric), ~tidyr::replace_na(., 0)))
 
   fullOffSet <- cohortRelationship %>%
-    dplyr::filter(.data$startDay == -9999) %>%
-    dplyr::filter(.data$endDay == 9999) %>%
-    dplyr::filter(.data$cohortId %in% c(targetCohortIds)) %>%
-    dplyr::filter(.data$comparatorCohortId %in% c(comparatorCohortIds)) %>%
+    dplyr::filter(startDay == -9999) %>%
+    dplyr::filter(endDay == 9999) %>%
+    dplyr::filter(cohortId %in% c(targetCohortIds)) %>%
+    dplyr::filter(comparatorCohortId %in% c(comparatorCohortIds)) %>%
     dplyr::select(
-      .data$databaseId,
-      .data$cohortId,
-      .data$comparatorCohortId,
-      .data$subjects
+      databaseId,
+      cohortId,
+      comparatorCohortId,
+      subjects
     ) %>%
     dplyr::inner_join(
       cohortCounts %>%
-        dplyr::select(-.data$cohortEntries) %>%
-        dplyr::rename(targetCohortSubjects = .data$cohortSubjects),
+        dplyr::select(-cohortEntries) %>%
+        dplyr::rename(targetCohortSubjects = cohortSubjects),
       by = c("databaseId", "cohortId")
     ) %>%
-    dplyr::mutate(tOnlySubjects = .data$targetCohortSubjects - .data$subjects) %>%
+    dplyr::mutate(tOnlySubjects = targetCohortSubjects - subjects) %>%
     dplyr::inner_join(
       cohortCounts %>%
-        dplyr::select(-.data$cohortEntries) %>%
+        dplyr::select(-cohortEntries) %>%
         dplyr::rename(
-          comparatorCohortSubjects = .data$cohortSubjects,
-          comparatorCohortId = .data$cohortId
+          comparatorCohortSubjects = cohortSubjects,
+          comparatorCohortId = cohortId
         ),
       by = c("databaseId", "comparatorCohortId")
     ) %>%
-    dplyr::mutate(cOnlySubjects = .data$comparatorCohortSubjects - .data$subjects) %>%
-    dplyr::mutate(eitherSubjects = .data$cOnlySubjects + .data$tOnlySubjects + .data$subjects) %>%
+    dplyr::mutate(cOnlySubjects = comparatorCohortSubjects - subjects) %>%
+    dplyr::mutate(eitherSubjects = cOnlySubjects + tOnlySubjects + subjects) %>%
     dplyr::rename(
-      targetCohortId = .data$cohortId,
-      bothSubjects = .data$subjects
+      targetCohortId = cohortId,
+      bothSubjects = subjects
     ) %>%
     dplyr::select(
-      .data$databaseId,
-      .data$targetCohortId,
-      .data$comparatorCohortId,
-      .data$bothSubjects,
-      .data$tOnlySubjects,
-      .data$cOnlySubjects,
-      .data$eitherSubjects
+      databaseId,
+      targetCohortId,
+      comparatorCohortId,
+      bothSubjects,
+      tOnlySubjects,
+      cOnlySubjects,
+      eitherSubjects
     )
 
 
   noOffset <- cohortRelationship %>%
-    dplyr::filter(.data$comparatorCohortId %in% comparatorCohortIds) %>%
-    dplyr::filter(.data$cohortId %in% targetCohortIds) %>%
-    dplyr::filter(.data$startDay == 0) %>%
-    dplyr::filter(.data$endDay == 0) %>%
+    dplyr::filter(comparatorCohortId %in% comparatorCohortIds) %>%
+    dplyr::filter(cohortId %in% targetCohortIds) %>%
+    dplyr::filter(startDay == 0) %>%
+    dplyr::filter(endDay == 0) %>%
     dplyr::select(
-      .data$databaseId,
-      .data$cohortId,
-      .data$comparatorCohortId,
-      .data$subCsBeforeTs,
-      .data$subCWithinT,
-      .data$subCsAfterTs,
-      .data$subCsAfterTe,
-      .data$subCsBeforeTs,
-      .data$subCsBeforeTe,
-      .data$subCsOnTs,
-      .data$subCsOnTe
+      databaseId,
+      cohortId,
+      comparatorCohortId,
+      subCsBeforeTs,
+      subCWithinT,
+      subCsAfterTs,
+      subCsAfterTe,
+      subCsBeforeTs,
+      subCsBeforeTe,
+      subCsOnTs,
+      subCsOnTe
     ) %>%
     dplyr::rename(
-      cBeforeTSubjects = .data$subCsBeforeTs,
-      targetCohortId = .data$cohortId,
-      cInTSubjects = .data$subCWithinT,
-      cStartAfterTStart = .data$subCsAfterTs,
-      cStartAfterTEnd = .data$subCsAfterTe,
-      cStartBeforeTStart = .data$subCsBeforeTs,
-      cStartBeforeTEnd = .data$subCsBeforeTe,
-      cStartOnTStart = .data$subCsOnTs,
-      cStartOnTEnd = .data$subCsOnTe
+      cBeforeTSubjects = subCsBeforeTs,
+      targetCohortId = cohortId,
+      cInTSubjects = subCWithinT,
+      cStartAfterTStart = subCsAfterTs,
+      cStartAfterTEnd = subCsAfterTe,
+      cStartBeforeTStart = subCsBeforeTs,
+      cStartBeforeTEnd = subCsBeforeTe,
+      cStartOnTStart = subCsOnTs,
+      cStartOnTEnd = subCsOnTe
     )
 
   result <- fullOffSet %>%
     dplyr::left_join(noOffset,
       by = c("databaseId", "targetCohortId", "comparatorCohortId")
     ) %>%
-    dplyr::filter(.data$targetCohortId != .data$comparatorCohortId) %>%
+    dplyr::filter(targetCohortId != comparatorCohortId) %>%
     dplyr::select(
-      .data$databaseId,
-      # .data$cohortId,
-      .data$comparatorCohortId,
-      .data$eitherSubjects,
-      .data$tOnlySubjects,
-      .data$cOnlySubjects,
-      .data$bothSubjects,
-      # .data$cBeforeTSubjects,
-      .data$targetCohortId,
-      .data$cInTSubjects,
-      .data$cStartAfterTStart,
-      .data$cStartAfterTEnd,
-      .data$cStartBeforeTStart,
-      .data$cStartBeforeTEnd,
-      .data$cStartOnTStart,
-      .data$cStartOnTEnd,
+      databaseId,
+      # cohortId,
+      comparatorCohortId,
+      eitherSubjects,
+      tOnlySubjects,
+      cOnlySubjects,
+      bothSubjects,
+      # cBeforeTSubjects,
+      targetCohortId,
+      cInTSubjects,
+      cStartAfterTStart,
+      cStartAfterTEnd,
+      cStartBeforeTStart,
+      cStartBeforeTEnd,
+      cStartOnTStart,
+      cStartOnTEnd,
     )
 
-  databaseNames <- cohortCounts %>% dplyr::distinct(.data$databaseId, .data$databaseName)
+  databaseNames <- cohortCounts %>% dplyr::distinct(databaseId, databaseName)
   result <- result %>% dplyr::inner_join(databaseNames, by = "databaseId")
 
   return(result)
@@ -960,16 +960,16 @@ getCohortRelationshipCharacterizationResults <-
       dplyr::inner_join(cohortCounts,
         by = c("cohortId", "databaseId")
       ) %>%
-      dplyr::mutate(sumValue = .data$subCeWindowT + .data$subCsWindowT - .data$subCWithinT) %>%
-      dplyr::mutate(mean = .data$sumValue / .data$cohortSubjects) %>%
+      dplyr::mutate(sumValue = subCeWindowT + subCsWindowT - subCWithinT) %>%
+      dplyr::mutate(mean = sumValue / cohortSubjects) %>%
       dplyr::select(
-        .data$cohortId,
-        .data$comparatorCohortId,
-        .data$databaseId,
-        .data$startDay,
-        .data$endDay,
-        .data$mean,
-        .data$sumValue
+        cohortId,
+        comparatorCohortId,
+        databaseId,
+        startDay,
+        endDay,
+        mean,
+        sumValue
       ) %>%
       dplyr::mutate(analysisId = -301)
 
@@ -978,16 +978,16 @@ getCohortRelationshipCharacterizationResults <-
       dplyr::inner_join(cohortCounts,
         by = c("cohortId", "databaseId")
       ) %>%
-      dplyr::mutate(sumValue = .data$subCsWindowT) %>%
-      dplyr::mutate(mean = .data$sumValue / .data$cohortSubjects) %>%
+      dplyr::mutate(sumValue = subCsWindowT) %>%
+      dplyr::mutate(mean = sumValue / cohortSubjects) %>%
       dplyr::select(
-        .data$cohortId,
-        .data$comparatorCohortId,
-        .data$databaseId,
-        .data$startDay,
-        .data$endDay,
-        .data$mean,
-        .data$sumValue
+        cohortId,
+        comparatorCohortId,
+        databaseId,
+        startDay,
+        endDay,
+        mean,
+        sumValue
       ) %>%
       dplyr::mutate(analysisId = -201)
 
@@ -995,13 +995,13 @@ getCohortRelationshipCharacterizationResults <-
       subjectsOverlap,
       subjectsStart
     ) %>%
-      dplyr::filter(.data$comparatorCohortId > 0) %>%
-      dplyr::mutate(covariateId = (.data$comparatorCohortId * -1000) + .data$analysisId)
+      dplyr::filter(comparatorCohortId > 0) %>%
+      dplyr::mutate(covariateId = (comparatorCohortId * -1000) + analysisId)
 
     # suppressing warning because of - negative causing NaN values
     data <- suppressWarnings(expr = {
       data %>%
-        dplyr::mutate(sd = sqrt(.data$mean * (1 - .data$mean)))
+        dplyr::mutate(sd = sqrt(mean * (1 - mean)))
     }, classes = "warning")
 
     temporalTimeRefFull <-
@@ -1009,8 +1009,8 @@ getCohortRelationshipCharacterizationResults <-
 
     temporalTimeRef <- data %>%
       dplyr::select(
-        .data$startDay,
-        .data$endDay
+        startDay,
+        endDay
       ) %>%
       dplyr::distinct() %>%
       dplyr::inner_join(temporalTimeRefFull,
@@ -1029,7 +1029,7 @@ getCohortRelationshipCharacterizationResults <-
         missingMeansZero = "Y"
       ) %>%
       dplyr::inner_join(data %>%
-        dplyr::select(.data$analysisId) %>%
+        dplyr::select(analysisId) %>%
         dplyr::distinct(),
       by = c("analysisId")
       )
@@ -1037,67 +1037,67 @@ getCohortRelationshipCharacterizationResults <-
       cohort,
       analysisRef %>%
         dplyr::select(
-          .data$analysisId,
-          .data$analysisName
+          analysisId,
+          analysisName
         )
     ) %>%
-      dplyr::mutate(covariateId = (.data$cohortId * -1000) + .data$analysisId) %>%
-      dplyr::inner_join(data %>% dplyr::select(.data$covariateId) %>% dplyr::distinct(),
+      dplyr::mutate(covariateId = (cohortId * -1000) + analysisId) %>%
+      dplyr::inner_join(data %>% dplyr::select(covariateId) %>% dplyr::distinct(),
         by = "covariateId"
       ) %>%
       dplyr::mutate(covariateName = paste0(
-        .data$analysisName,
+        analysisName,
         ": (",
-        .data$cohortId,
+        cohortId,
         ") ",
-        .data$cohortName
+        cohortName
       )) %>%
-      dplyr::mutate(conceptId = .data$cohortId * -1) %>%
-      dplyr::arrange(.data$covariateId) %>%
+      dplyr::mutate(conceptId = cohortId * -1) %>%
+      dplyr::arrange(covariateId) %>%
       dplyr::select(
-        .data$analysisId,
-        .data$conceptId,
-        .data$covariateId,
-        .data$covariateName
+        analysisId,
+        conceptId,
+        covariateId,
+        covariateName
       )
     concept <- cohort %>%
-      dplyr::filter(.data$cohortId %in% c(data$comparatorCohortId %>% unique())) %>%
+      dplyr::filter(cohortId %in% c(data$comparatorCohortId %>% unique())) %>%
       dplyr::mutate(
-        conceptId = .data$cohortId * -1,
-        conceptName = .data$cohortName,
+        conceptId = cohortId * -1,
+        conceptName = cohortName,
         domainId = "Cohort",
         vocabularyId = "Cohort",
         conceptClassId = "Cohort",
         standardConcept = "S",
-        conceptCode = as.character(.data$cohortId),
+        conceptCode = as.character(cohortId),
         validStartDate = as.Date("2002-01-31"),
         validEndDate = as.Date("2099-12-31"),
         invalidReason = as.character(NA)
       ) %>%
       dplyr::select(
-        .data$conceptId,
-        .data$conceptName,
-        .data$domainId,
-        .data$vocabularyId,
-        .data$conceptClassId,
-        .data$standardConcept,
-        .data$conceptCode,
-        .data$validStartDate,
-        .data$validEndDate,
-        .data$invalidReason
+        conceptId,
+        conceptName,
+        domainId,
+        vocabularyId,
+        conceptClassId,
+        standardConcept,
+        conceptCode,
+        validStartDate,
+        validEndDate,
+        invalidReason
       ) %>%
-      dplyr::arrange(.data$conceptId)
+      dplyr::arrange(conceptId)
 
     covariateValue <- data %>%
       dplyr::select(
-        .data$cohortId,
-        .data$covariateId,
-        .data$databaseId,
-        .data$startDay,
-        .data$endDay,
-        .data$mean,
-        .data$sd,
-        .data$sumValue
+        cohortId,
+        covariateId,
+        databaseId,
+        startDay,
+        endDay,
+        mean,
+        sd,
+        sumValue
       )
 
     data <- list(
@@ -1204,38 +1204,38 @@ getResultsTemporalTimeRef <- function(dataSource) {
   }
 
   temporalChoices <- temporalTimeRef %>%
-    dplyr::mutate(temporalChoices = paste0("T (", .data$startDay, "d to ", .data$endDay, "d)")) %>%
-    dplyr::arrange(.data$startDay, .data$endDay) %>%
+    dplyr::mutate(temporalChoices = paste0("T (", startDay, "d to ", endDay, "d)")) %>%
+    dplyr::arrange(startDay, endDay) %>%
     dplyr::select(
-      .data$timeId,
-      .data$startDay,
-      .data$endDay,
-      .data$temporalChoices
+      timeId,
+      startDay,
+      endDay,
+      temporalChoices
     ) %>%
     dplyr::mutate(primaryTimeId = dplyr::if_else(
       condition = (
-        (.data$startDay == -365 & .data$endDay == -31) |
-          (.data$startDay == -30 & .data$endDay == -1) |
-          (.data$startDay == 0 & .data$endDay == 0) |
-          (.data$startDay == 1 & .data$endDay == 30) |
-          (.data$startDay == 31 & .data$endDay == 365) |
-          (.data$startDay == -365 & .data$endDay == 0) |
-          (.data$startDay == -30 & .data$endDay == 0)
+        (startDay == -365 & endDay == -31) |
+          (startDay == -30 & endDay == -1) |
+          (startDay == 0 & endDay == 0) |
+          (startDay == 1 & endDay == 30) |
+          (startDay == 31 & endDay == 365) |
+          (startDay == -365 & endDay == 0) |
+          (startDay == -30 & endDay == 0)
       ),
       true = 1,
       false = 0
     )) %>%
     dplyr::mutate(isTemporal = dplyr::if_else(
       condition = (
-        (.data$endDay == 0 & .data$startDay == -30) |
-          (.data$endDay == 0 & .data$startDay == -180) |
-          (.data$endDay == 0 & .data$startDay == -365) |
-          (.data$endDay == 0 & .data$startDay == -9999)
+        (endDay == 0 & startDay == -30) |
+          (endDay == 0 & startDay == -180) |
+          (endDay == 0 & startDay == -365) |
+          (endDay == 0 & startDay == -9999)
       ),
       true = 0,
       false = 1
     )) %>%
-    dplyr::arrange(.data$startDay, .data$timeId, .data$endDay)
+    dplyr::arrange(startDay, timeId, endDay)
 
   temporalChoices <- dplyr::bind_rows(
     temporalChoices %>% dplyr::slice(0),
diff --git a/inst/shiny/DiagnosticsExplorer/R/Results.R b/inst/shiny/DiagnosticsExplorer/R/Results.R
index 2155e8384..fe2e2f8fe 100644
--- a/inst/shiny/DiagnosticsExplorer/R/Results.R
+++ b/inst/shiny/DiagnosticsExplorer/R/Results.R
@@ -53,7 +53,7 @@ getIncidenceRateRanges <- function(dataSource, minPersonYears = 0) {
     person_years = minPersonYears,
     snakeCaseToCamelCase = TRUE
   ) %>%
-    dplyr::mutate(ageGroup = dplyr::na_if(.data$ageGroup, ""))
+    dplyr::mutate(ageGroup = dplyr::na_if(ageGroup, ""))
 
   sql <- "SELECT DISTINCT calendar_year FROM @results_database_schema.@ir_table WHERE person_years >= @person_years"
 
@@ -67,9 +67,9 @@ getIncidenceRateRanges <- function(dataSource, minPersonYears = 0) {
     snakeCaseToCamelCase = TRUE
   ) %>%
     dplyr::mutate(
-      calendarYear = dplyr::na_if(.data$calendarYear, "")
+      calendarYear = dplyr::na_if(calendarYear, "")
     ) %>%
-    dplyr::mutate(calendarYear = as.integer(.data$calendarYear))
+    dplyr::mutate(calendarYear = as.integer(calendarYear))
 
   sql <- "SELECT DISTINCT gender FROM @results_database_schema.@ir_table WHERE person_years >= @person_years"
 
@@ -82,7 +82,7 @@ getIncidenceRateRanges <- function(dataSource, minPersonYears = 0) {
     person_years = minPersonYears,
     snakeCaseToCamelCase = TRUE
   ) %>%
-    dplyr::mutate(gender = dplyr::na_if(.data$gender, ""))
+    dplyr::mutate(gender = dplyr::na_if(gender, ""))
 
 
   sql <- "SELECT
@@ -182,17 +182,17 @@ getIncidenceRateResult <- function(dataSource,
 
   data <- data %>%
     dplyr::mutate(
-      gender = dplyr::na_if(.data$gender, ""),
-      ageGroup = dplyr::na_if(.data$ageGroup, ""),
-      calendarYear = dplyr::na_if(.data$calendarYear, "")
+      gender = dplyr::na_if(gender, ""),
+      ageGroup = dplyr::na_if(ageGroup, ""),
+      calendarYear = dplyr::na_if(calendarYear, "")
     ) %>%
-    dplyr::mutate(calendarYear = as.integer(.data$calendarYear)) %>%
-    dplyr::arrange(.data$cohortId, .data$databaseId)
+    dplyr::mutate(calendarYear = as.integer(calendarYear)) %>%
+    dplyr::arrange(cohortId, databaseId)
 
 
   if (!is.na(minSubjectCount)) {
     data <- data %>%
-      dplyr::filter(.data$cohortSubjects > !!minSubjectCount)
+      dplyr::filter(cohortSubjects > !!minSubjectCount)
   }
 
   return(data)
@@ -255,32 +255,32 @@ getInclusionRuleStats <- function(dataSource,
   }
 
   result <- inclusion %>%
-    dplyr::select(.data$cohortId, .data$databaseId, .data$ruleSequence, .data$name) %>%
+    dplyr::select(cohortId, databaseId, ruleSequence, name) %>%
     dplyr::distinct() %>%
     dplyr::left_join(
       inclusionStats %>%
-        dplyr::filter(.data$modeId == !!modeId) %>%
+        dplyr::filter(modeId == !!modeId) %>%
         dplyr::select(
-          .data$cohortId,
-          .data$databaseId,
-          .data$ruleSequence,
-          .data$personCount,
-          .data$gainCount,
-          .data$personTotal
+          cohortId,
+          databaseId,
+          ruleSequence,
+          personCount,
+          gainCount,
+          personTotal
         ),
       by = c("cohortId", "databaseId", "ruleSequence")
     ) %>%
-    dplyr::arrange(.data$cohortId,
-                   .data$databaseId,
-                   .data$ruleSequence) %>%
+    dplyr::arrange(cohortId,
+                   databaseId,
+                   ruleSequence) %>%
     dplyr::mutate(remain = 0)
 
   inclusionResults <- inclusionResults %>%
-    dplyr::filter(.data$modeId == !!modeId)
+    dplyr::filter(modeId == !!modeId)
 
   combis <- result %>%
-    dplyr::select(.data$cohortId,
-                  .data$databaseId) %>%
+    dplyr::select(cohortId,
+                  databaseId) %>%
     dplyr::distinct()
 
   resultFinal <- c()
@@ -305,22 +305,22 @@ getInclusionRuleStats <- function(dataSource,
   }
   resultFinal <- dplyr::bind_rows(resultFinal) %>%
     dplyr::rename(
-      "meetSubjects" = .data$personCount,
-      "gainSubjects" = .data$gainCount,
-      "remainSubjects" = .data$remain,
-      "totalSubjects" = .data$personTotal,
-      "ruleName" = .data$name,
-      "ruleSequenceId" = .data$ruleSequence
+      "meetSubjects" = personCount,
+      "gainSubjects" = gainCount,
+      "remainSubjects" = remain,
+      "totalSubjects" = personTotal,
+      "ruleName" = name,
+      "ruleSequenceId" = ruleSequence
     ) %>%
     dplyr::select(
-      .data$cohortId,
-      .data$ruleSequenceId,
-      .data$ruleName,
-      .data$meetSubjects,
-      .data$gainSubjects,
-      .data$remainSubjects,
-      .data$totalSubjects,
-      .data$databaseId
+      cohortId,
+      ruleSequenceId,
+      ruleName,
+      meetSubjects,
+      gainSubjects,
+      remainSubjects,
+      totalSubjects,
+      databaseId
     )
   return(resultFinal)
 }
@@ -370,8 +370,8 @@ getIndexEventBreakdown <- function(dataSource,
                       by = c("databaseId", "cohortId")
     ) %>%
     dplyr::mutate(
-      subjectPercent = .data$subjectCount / .data$cohortSubjects,
-      conceptPercent = .data$conceptCount / .data$cohortEntries
+      subjectPercent = subjectCount / cohortSubjects,
+      conceptPercent = conceptCount / cohortEntries
     )
 
   return(data)
@@ -415,7 +415,7 @@ getVisitContextResults <- function(dataSource,
     dplyr::inner_join(cohortCount,
                       by = c("cohortId", "databaseId")
     ) %>%
-    dplyr::mutate(subjectPercent = .data$subjects / .data$cohortSubjects)
+    dplyr::mutate(subjectPercent = subjects / cohortSubjects)
   return(data)
 }
 
@@ -501,18 +501,18 @@ getCountForConceptIdInCohort <-
 
     standardConceptId <- data %>%
       dplyr::select(
-        .data$databaseId,
-        .data$conceptId,
-        .data$conceptSubjects,
-        .data$conceptCount
+        databaseId,
+        conceptId,
+        conceptSubjects,
+        conceptCount
       ) %>%
       dplyr::group_by(
-        .data$databaseId,
-        .data$conceptId
+        databaseId,
+        conceptId
       ) %>%
       dplyr::summarise(
-        conceptSubjects = max(.data$conceptSubjects),
-        conceptCount = sum(.data$conceptCount),
+        conceptSubjects = max(conceptSubjects),
+        conceptCount = sum(conceptCount),
         .groups = "keep"
       ) %>%
       dplyr::ungroup()
@@ -520,19 +520,19 @@ getCountForConceptIdInCohort <-
 
     sourceConceptId <- data %>%
       dplyr::select(
-        .data$databaseId,
-        .data$sourceConceptId,
-        .data$conceptSubjects,
-        .data$conceptCount
+        databaseId,
+        sourceConceptId,
+        conceptSubjects,
+        conceptCount
       ) %>%
-      dplyr::rename(conceptId = .data$sourceConceptId) %>%
+      dplyr::rename(conceptId = sourceConceptId) %>%
       dplyr::group_by(
-        .data$databaseId,
-        .data$conceptId
+        databaseId,
+        conceptId
       ) %>%
       dplyr::summarise(
-        conceptSubjects = max(.data$conceptSubjects),
-        conceptCount = sum(.data$conceptCount),
+        conceptSubjects = max(conceptSubjects),
+        conceptCount = sum(conceptCount),
         .groups = "keep"
       ) %>%
       dplyr::ungroup()
@@ -542,12 +542,12 @@ getCountForConceptIdInCohort <-
       sourceConceptId %>%
         dplyr::anti_join(
           y = standardConceptId %>%
-            dplyr::select(.data$databaseId, .data$conceptId),
+            dplyr::select(databaseId, conceptId),
           by = c("databaseId", "conceptId")
         )
     ) %>%
       dplyr::distinct() %>%
-      dplyr::arrange(.data$databaseId, .data$conceptId)
+      dplyr::arrange(databaseId, conceptId)
 
     return(data)
   }
@@ -641,17 +641,17 @@ resolveMappedConceptSetFromVocabularyDatabaseSchema <-
       ) %>%
         tidyr::tibble() %>%
         dplyr::select(
-          .data$conceptSetId,
-          .data$conceptId,
-          .data$conceptName,
-          .data$domainId,
-          .data$vocabularyId,
-          .data$conceptClassId,
-          .data$standardConcept,
-          .data$conceptCode,
-          .data$invalidReason
+          conceptSetId,
+          conceptId,
+          conceptName,
+          domainId,
+          vocabularyId,
+          conceptClassId,
+          standardConcept,
+          conceptCode,
+          invalidReason
         ) %>%
-        dplyr::arrange(.data$conceptId)
+        dplyr::arrange(conceptId)
     mapped <-
       renderTranslateQuerySql(
         connection = dataSource$connection,
@@ -664,18 +664,18 @@ resolveMappedConceptSetFromVocabularyDatabaseSchema <-
       ) %>%
         tidyr::tibble() %>%
         dplyr::select(
-          .data$resolvedConceptId,
-          .data$conceptId,
-          .data$conceptName,
-          .data$domainId,
-          .data$vocabularyId,
-          .data$conceptClassId,
-          .data$standardConcept,
-          .data$conceptCode,
-          .data$conceptSetId
+          resolvedConceptId,
+          conceptId,
+          conceptName,
+          domainId,
+          vocabularyId,
+          conceptClassId,
+          standardConcept,
+          conceptCode,
+          conceptSetId
         ) %>%
         dplyr::distinct() %>%
-        dplyr::arrange(.data$resolvedConceptId, .data$conceptId)
+        dplyr::arrange(resolvedConceptId, conceptId)
 
     data <- list(resolved = resolved, mapped = mapped)
     return(data)
@@ -717,7 +717,7 @@ resolvedConceptSet <- function(dataSource,
       snakeCaseToCamelCase = TRUE
     ) %>%
       tidyr::tibble() %>%
-      dplyr::arrange(.data$conceptId)
+      dplyr::arrange(conceptId)
 
   return(resolved)
 }
@@ -829,7 +829,7 @@ mappedConceptSet <- function(dataSource,
       snakeCaseToCamelCase = TRUE
     ) %>%
       tidyr::tibble() %>%
-      dplyr::arrange(.data$resolvedConceptId)
+      dplyr::arrange(resolvedConceptId)
   return(mapped)
 }
 
@@ -900,20 +900,20 @@ getExecutionMetadata <- function(dataSource, databaseId) {
     )]
 
   transposeNonJsons <- databaseMetadata %>%
-    dplyr::filter(.data$variableField %in% c(columnNamesNoJson)) %>%
+    dplyr::filter(variableField %in% c(columnNamesNoJson)) %>%
     dplyr::rename(name = "variableField") %>%
-    dplyr::group_by(.data$databaseId, .data$startTime, .data$name) %>%
+    dplyr::group_by(databaseId, startTime, name) %>%
     dplyr::summarise(
-      valueField = max(.data$valueField),
+      valueField = max(valueField),
       .groups = "keep"
     ) %>%
     dplyr::ungroup() %>%
     tidyr::pivot_wider(
-      names_from = .data$name,
-      values_from = .data$valueField
+      names_from = name,
+      values_from = valueField
     ) %>%
     dplyr::mutate(startTime = stringr::str_replace(
-      string = .data$startTime,
+      string = startTime,
       pattern = "TM_",
       replacement = ""
     ))
@@ -922,20 +922,20 @@ getExecutionMetadata <- function(dataSource, databaseId) {
     transposeNonJsons$startTime %>% lubridate::as_datetime()
 
   transposeJsons <- databaseMetadata %>%
-    dplyr::filter(.data$variableField %in% c(columnNamesJson)) %>%
+    dplyr::filter(variableField %in% c(columnNamesJson)) %>%
     dplyr::rename(name = "variableField") %>%
-    dplyr::group_by(.data$databaseId, .data$startTime, .data$name) %>%
+    dplyr::group_by(databaseId, startTime, name) %>%
     dplyr::summarise(
-      valueField = max(.data$valueField),
+      valueField = max(valueField),
       .groups = "keep"
     ) %>%
     dplyr::ungroup() %>%
     tidyr::pivot_wider(
-      names_from = .data$name,
-      values_from = .data$valueField
+      names_from = name,
+      values_from = valueField
     ) %>%
     dplyr::mutate(startTime = stringr::str_replace(
-      string = .data$startTime,
+      string = startTime,
       pattern = "TM_",
       replacement = ""
     ))
diff --git a/inst/shiny/DiagnosticsExplorer/R/StartUpScripts.R b/inst/shiny/DiagnosticsExplorer/R/StartUpScripts.R
index e2aef2af7..c569e26fa 100644
--- a/inst/shiny/DiagnosticsExplorer/R/StartUpScripts.R
+++ b/inst/shiny/DiagnosticsExplorer/R/StartUpScripts.R
@@ -381,7 +381,7 @@ initializeEnvironment <- function(shinySettings,
       "vocabularyVersion" %in% colnames(envir$database)) {
       envir$database <- envir$database %>%
         dplyr::mutate(
-          databaseIdWithVocabularyVersion = paste0(databaseId, " (", .data$vocabularyVersion, ")")
+          databaseIdWithVocabularyVersion = paste0(databaseId, " (", vocabularyVersion, ")")
         )
     }
 
@@ -389,22 +389,22 @@ initializeEnvironment <- function(shinySettings,
     envir$databaseMetadata <- envir$database %>%
       dplyr::distinct() %>%
       dplyr::mutate(id = dplyr::row_number()) %>%
-      dplyr::mutate(shortName = paste0("D", .data$id)) %>%
+      dplyr::mutate(shortName = paste0("D", id)) %>%
       dplyr::left_join(envir$databaseMetadata,
                        by = "databaseId"
       ) %>%
-      dplyr::relocate(.data$id, .data$databaseId, .data$shortName)
+      dplyr::relocate(id, databaseId, shortName)
 
 
     if ("databaseName" %in% names(envir$database)) {
       envir$dbMapping <- envir$database %>%
-        dplyr::select(.data$databaseId, .data$databaseName) %>%
+        dplyr::select(databaseId, databaseName) %>%
         dplyr::distinct()
     } else {
       envir$dbMapping <- envir$database %>%
-        dplyr::select(.data$databaseId, .data$cdmSourceName) %>%
+        dplyr::select(databaseId, cdmSourceName) %>%
         dplyr::distinct() %>%
-        dplyr::mutate(databaseName = .data$cdmSourceName)
+        dplyr::mutate(databaseName = cdmSourceName)
     }
   }
 
@@ -414,12 +414,12 @@ initializeEnvironment <- function(shinySettings,
   if (!is.null(envir$temporalTimeRef)) {
     envir$temporalChoices <- getResultsTemporalTimeRef(dataSource = envir$dataSource)
     envir$temporalCharacterizationTimeIdChoices <- envir$temporalChoices %>%
-      dplyr::arrange(.data$sequence)
+      dplyr::arrange(sequence)
 
     envir$characterizationTimeIdChoices <- envir$temporalChoices %>%
-      dplyr::filter(.data$isTemporal == 0) %>%
-      dplyr::filter(.data$primaryTimeId == 1) %>%
-      dplyr::arrange(.data$sequence)
+      dplyr::filter(isTemporal == 0) %>%
+      dplyr::filter(primaryTimeId == 1) %>%
+      dplyr::arrange(sequence)
   }
 
   if (!is.null(envir$temporalAnalysisRef)) {
@@ -435,14 +435,14 @@ initializeEnvironment <- function(shinySettings,
     )
 
     envir$domainIdOptions <- envir$temporalAnalysisRef %>%
-      dplyr::select(.data$domainId) %>%
-      dplyr::pull(.data$domainId) %>%
+      dplyr::select(domainId) %>%
+      dplyr::pull(domainId) %>%
       unique() %>%
       sort()
 
     envir$analysisNameOptions <- envir$temporalAnalysisRef %>%
-      dplyr::select(.data$analysisName) %>%
-      dplyr::pull(.data$analysisName) %>%
+      dplyr::select(analysisName) %>%
+      dplyr::pull(analysisName) %>%
       unique() %>%
       sort()
   }
diff --git a/inst/shiny/DiagnosticsExplorer/R/Tables.R b/inst/shiny/DiagnosticsExplorer/R/Tables.R
index b4737432a..269094219 100644
--- a/inst/shiny/DiagnosticsExplorer/R/Tables.R
+++ b/inst/shiny/DiagnosticsExplorer/R/Tables.R
@@ -198,9 +198,9 @@ compareCohortCharacteristics <-
     characteristics1Renamed <- characteristics1 %>%
       dplyr::rename(
         sumValue1 = sumValue,
-        mean1 = .data$mean,
-        sd1 = .data$sd,
-        cohortId1 = .data$cohortId
+        mean1 = mean,
+        sd1 = sd,
+        cohortId1 = cohortId
       )
     cohortId1Value <- characteristics1Renamed$cohortId1 %>% unique()
     if (length(cohortId1Value) > 1) {
@@ -209,10 +209,10 @@ compareCohortCharacteristics <-
 
     characteristics2Renamed <- characteristics2 %>%
       dplyr::rename(
-        sumValue2 = .data$sumValue,
-        mean2 = .data$mean,
-        sd2 = .data$sd,
-        cohortId2 = .data$cohortId
+        sumValue2 = sumValue,
+        mean2 = mean,
+        sd2 = sd,
+        cohortId2 = cohortId
       )
     cohortId2Value <- characteristics2Renamed$cohortId2 %>% unique()
     if (length(cohortId2Value) > 1) {
@@ -238,22 +238,22 @@ compareCohortCharacteristics <-
         )
       ) %>%
       dplyr::mutate(
-        mean2 = ifelse(is.na(.data$mean2), 0, .data$mean2),
-        sd2 = ifelse(is.na(.data$sd2), 0, .data$sd2),
-        sd1 = ifelse(is.na(.data$sd1), 0, .data$sd1),
-        mean1 = ifelse(is.na(.data$mean1), 0, .data$mean1),
+        mean2 = ifelse(is.na(mean2), 0, mean2),
+        sd2 = ifelse(is.na(sd2), 0, sd2),
+        sd1 = ifelse(is.na(sd1), 0, sd1),
+        mean1 = ifelse(is.na(mean1), 0, mean1),
       ) %>%
       dplyr::mutate(
-        sdd = sqrt(.data$sd1^2 + .data$sd2^2)
+        sdd = sqrt(sd1^2 + sd2^2)
       )
 
     characteristics$stdDiff <- (characteristics$mean1 - characteristics$mean2) / characteristics$sdd
 
     characteristics <- characteristics %>%
-      dplyr::arrange(-abs(.data$stdDiff)) %>%
-      dplyr::mutate(stdDiff = dplyr::na_if(.data$stdDiff, 0)) %>%
+      dplyr::arrange(-abs(stdDiff)) %>%
+      dplyr::mutate(stdDiff = dplyr::na_if(stdDiff, 0)) %>%
       dplyr::mutate(
-        absStdDiff = abs(.data$stdDiff),
+        absStdDiff = abs(stdDiff),
         cohortId1 = !!cohortId1Value,
         cohortId2 = !!cohortId2Value,
       )
diff --git a/inst/shiny/DiagnosticsExplorer/R/TimeDistributionsModule.R b/inst/shiny/DiagnosticsExplorer/R/TimeDistributionsModule.R
index 1edccd4bc..ad8c3155e 100644
--- a/inst/shiny/DiagnosticsExplorer/R/TimeDistributionsModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/TimeDistributionsModule.R
@@ -47,16 +47,16 @@ plotTimeDistribution <- function(data, shortNameRef = NULL) {
   )
 
   sortShortName <- plotData %>%
-    dplyr::select(.data$shortName) %>%
+    dplyr::select(shortName) %>%
     dplyr::distinct() %>%
     dplyr::arrange(-as.integer(sub(
-      pattern = "^C", "", x = .data$shortName
+      pattern = "^C", "", x = shortName
     )))
 
   plotData <- plotData %>%
     dplyr::arrange(
-      shortName = factor(.data$shortName, levels = sortShortName$shortName),
-      .data$shortName
+      shortName = factor(shortName, levels = sortShortName$shortName),
+      shortName
     )
 
   plotData$shortName <- factor(plotData$shortName,
@@ -65,13 +65,13 @@ plotTimeDistribution <- function(data, shortNameRef = NULL) {
 
   plot <- ggplot2::ggplot(data = plotData) +
     ggplot2::aes(
-      x = .data$shortName,
-      ymin = .data$minValue,
-      lower = .data$p25Value,
-      middle = .data$medianValue,
-      upper = .data$p75Value,
-      ymax = .data$maxValue,
-      average = .data$averageValue
+      x = shortName,
+      ymin = minValue,
+      lower = p25Value,
+      middle = medianValue,
+      upper = p75Value,
+      ymax = maxValue,
+      average = averageValue
     ) +
     ggplot2::geom_errorbar(size = 0.5) +
     ggiraph::geom_boxplot_interactive(
@@ -91,7 +91,7 @@ plotTimeDistribution <- function(data, shortNameRef = NULL) {
       strip.text.y = ggplot2::element_text(size = 5)
     )
   height <-
-    1.5 + 0.4 * nrow(dplyr::distinct(plotData, .data$databaseId, .data$shortName))
+    1.5 + 0.4 * nrow(dplyr::distinct(plotData, databaseId, shortName))
   plot <- ggiraph::girafe(
     ggobj = plot,
     options = list(
@@ -239,7 +239,7 @@ timeDistributionsModule <- function(id,
       )
 
       if (hasData(data)) {
-        data <- data %>% dplyr::filter(.data$timeMetric %in% input$selecatableTimeMeasures)
+        data <- data %>% dplyr::filter(timeMetric %in% input$selecatableTimeMeasures)
       }
 
       return(data)
@@ -259,22 +259,22 @@ timeDistributionsModule <- function(id,
       validate(need(hasData(data), "No data for this combination"))
 
       data <- data %>%
-        dplyr::inner_join(cohortTable %>% dplyr::select(.data$cohortName, .data$cohortId), by = "cohortId") %>%
-        dplyr::arrange(.data$databaseId, .data$cohortId) %>%
+        dplyr::inner_join(cohortTable %>% dplyr::select(cohortName, cohortId), by = "cohortId") %>%
+        dplyr::arrange(databaseId, cohortId) %>%
         dplyr::select(
-          .data$cohortId,
-          Database = .data$databaseName,
-          Cohort = .data$cohortName,
-          TimeMeasure = .data$timeMetric,
-          Average = .data$averageValue,
-          SD = .data$standardDeviation,
-          Min = .data$minValue,
-          P10 = .data$p10Value,
-          P25 = .data$p25Value,
-          Median = .data$medianValue,
-          P75 = .data$p75Value,
-          P90 = .data$p90Value,
-          Max = .data$maxValue
+          cohortId,
+          Database = databaseName,
+          Cohort = cohortName,
+          TimeMeasure = timeMetric,
+          Average = averageValue,
+          SD = standardDeviation,
+          Min = minValue,
+          P10 = p10Value,
+          P25 = p25Value,
+          Median = medianValue,
+          P75 = p75Value,
+          P90 = p90Value,
+          Max = maxValue
         ) %>%
         dplyr::select(all_of(c("Database", "cohortId", "Cohort", "TimeMeasure", input$selecatableCols)))
 
diff --git a/inst/shiny/DiagnosticsExplorer/R/VisitContextModule.R b/inst/shiny/DiagnosticsExplorer/R/VisitContextModule.R
index d5e91ed8b..dfcc0d261 100644
--- a/inst/shiny/DiagnosticsExplorer/R/VisitContextModule.R
+++ b/inst/shiny/DiagnosticsExplorer/R/VisitContextModule.R
@@ -86,7 +86,7 @@ visitContextModule <- function(id,
     ## getVisitContexDataEnhanced----
     getVisitContexDataEnhanced <- shiny::reactive(x = { #spelling error here missing the t in Context
       visitContextData <- getVisitContextData() %>%
-        dplyr::rename(visitContextSubject = .data$subjects)
+        dplyr::rename(visitContextSubject = subjects)
       if (!hasData(visitContextData)) {
         return(NULL)
       }
@@ -108,23 +108,23 @@ visitContextModule <- function(id,
             )
           ) %>%
           dplyr::rename(
-            subjects = .data$cohortSubjects,
-            records = .data$cohortEntries
+            subjects = cohortSubjects,
+            records = cohortEntries
           ) %>%
           dplyr::select(
-            .data$databaseId,
-            .data$cohortId,
-            .data$visitConceptName,
-            .data$visitContext,
-            .data$subjects,
-            .data$records,
-            .data$visitContextSubject
+            databaseId,
+            cohortId,
+            visitConceptName,
+            visitContext,
+            subjects,
+            records,
+            visitContextSubject
           ) %>%
           dplyr::mutate(
             visitContext = dplyr::case_when(
-              .data$visitContext == "During visit" ~ "During",
-              .data$visitContext == "On visit start" ~ "Simultaneous",
-              TRUE ~ .data$visitContext
+              visitContext == "During visit" ~ "During",
+              visitContext == "On visit start" ~ "Simultaneous",
+              TRUE ~ visitContext
             )
           ) %>%
           tidyr::replace_na(replace = list(subjects = 0, records = 0))
@@ -132,16 +132,16 @@ visitContextModule <- function(id,
 
       if (input$visitContextTableFilters == "Before") {
         visitContextData <- visitContextData %>%
-          dplyr::filter(.data$visitContext == "Before")
+          dplyr::filter(visitContext == "Before")
       } else if (input$visitContextTableFilters == "During") {
         visitContextData <- visitContextData %>%
-          dplyr::filter(.data$visitContext == "During")
+          dplyr::filter(visitContext == "During")
       } else if (input$visitContextTableFilters == "Simultaneous") {
         visitContextData <- visitContextData %>%
-          dplyr::filter(.data$visitContext == "Simultaneous")
+          dplyr::filter(visitContext == "Simultaneous")
       } else if (input$visitContextTableFilters == "After") {
         visitContextData <- visitContextData %>%
-          dplyr::filter(.data$visitContext == "After")
+          dplyr::filter(visitContext == "After")
       }
       if (!hasData(visitContextData)) {
         return(NULL)
diff --git a/inst/shiny/DiagnosticsExplorer/global.R b/inst/shiny/DiagnosticsExplorer/global.R
index 2985bc2eb..3839a9ff9 100644
--- a/inst/shiny/DiagnosticsExplorer/global.R
+++ b/inst/shiny/DiagnosticsExplorer/global.R
@@ -5,7 +5,7 @@ diagExpEnv$shinyConfigPath <- getOption("CD-shiny-config", default = "config.yml
 # Source all app files in to isolated namespace
 lapply(file.path("R", list.files("R", pattern = "*.R")), source, local = diagExpEnv)
 
-diagExpEnv$appVersionNum <- "Version: 3.1.0"
+diagExpEnv$appVersionNum <- "Version: 3.1.1"
 
 if (exists("shinySettings")) {
   diagExpEnv$shinySettings <- shinySettings
@@ -19,3 +19,4 @@ if (exists("shinySettings")) {
 # Init tables and other parameters in global session
 diagExpEnv$initializeEnvironment(diagExpEnv$shinySettings, envir = diagExpEnv)
 
+
diff --git a/inst/shiny/DiagnosticsExplorer/renv.lock b/inst/shiny/DiagnosticsExplorer/renv.lock
index ee546424d..bcdcc3e08 100644
--- a/inst/shiny/DiagnosticsExplorer/renv.lock
+++ b/inst/shiny/DiagnosticsExplorer/renv.lock
@@ -1,804 +1,1070 @@
 {
   "R": {
-    "Version": "4.1.3",
+    "Version": "4.0.3",
     "Repositories": [
       {
         "Name": "CRAN",
-        "URL": "https://cran.rstudio.com"
+        "URL": "https://cloud.r-project.org"
       }
     ]
   },
   "Packages": {
-    "CirceR": {
-      "Package": "CirceR",
-      "Version": "1.1.1",
-      "Source": "GitHub",
-      "RemoteType": "github",
-      "RemoteHost": "api.github.com",
-      "RemoteRepo": "CirceR",
-      "RemoteUsername": "ohdsi",
-      "RemoteRef": "HEAD",
-      "RemoteSha": "eb27c4bd43f02c68a8bce6a01e02f9fe2b923b5c",
-      "Hash": "33321874c0165a3d3ac83b6821021faa",
-      "Requirements": [
-        "RJSONIO",
-        "rJava"
-      ]
+    "BH": {
+      "Package": "BH",
+      "Version": "1.72.0-3",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [],
+      "Hash": "8f9ce74c6417d61f0782cbae5fd2b7b0"
     },
     "DBI": {
       "Package": "DBI",
-      "Version": "1.1.2",
+      "Version": "1.1.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "dcd1743af4336156873e3ce3c950b8b9",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "methods"
+      ],
+      "Hash": "b2866e62bab9378c3cc9476a1954226b"
     },
     "DatabaseConnector": {
       "Package": "DatabaseConnector",
-      "Version": "5.0.2",
+      "Version": "5.1.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "627c74cec18d94a5140d5742e5d7d28a",
       "Requirements": [
         "DBI",
+        "R",
         "SqlRender",
         "bit64",
+        "methods",
         "rJava",
         "readr",
         "rlang",
         "stringr",
-        "urltools"
-      ]
+        "urltools",
+        "utils"
+      ],
+      "Hash": "7efe1532a5256de9dd7f2f8d90b4e6da"
     },
     "MASS": {
       "Package": "MASS",
-      "Version": "7.3-55",
+      "Version": "7.3-53",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "c5232ffb549f6d7a04a152c34ca1353d",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "grDevices",
+        "graphics",
+        "methods",
+        "stats",
+        "utils"
+      ],
+      "Hash": "d1bc1c8e9c0ace57ec9ffea01021d45f"
     },
     "Matrix": {
       "Package": "Matrix",
       "Version": "1.4-0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "130c0caba175739d98f2963c6a407cf6",
       "Requirements": [
-        "lattice"
-      ]
+        "R",
+        "graphics",
+        "grid",
+        "lattice",
+        "methods",
+        "stats",
+        "utils"
+      ],
+      "Hash": "130c0caba175739d98f2963c6a407cf6"
     },
     "R6": {
       "Package": "R6",
       "Version": "2.5.1",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "470851b6d5d0ac559e9d01bb352b4021",
-      "Requirements": []
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "470851b6d5d0ac559e9d01bb352b4021"
     },
     "RColorBrewer": {
       "Package": "RColorBrewer",
-      "Version": "1.1-3",
+      "Version": "1.1-2",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "45f0398006e83a5b10b72a90663d8d8c",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "e031418365a7f7a766181ab5a41a5716"
     },
     "RJSONIO": {
       "Package": "RJSONIO",
       "Version": "1.3-1.6",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "0c7658433758cea5bcae50edd02b55b7",
-      "Requirements": []
+      "Requirements": [
+        "methods"
+      ],
+      "Hash": "0c7658433758cea5bcae50edd02b55b7"
     },
     "Rcpp": {
       "Package": "Rcpp",
-      "Version": "1.0.8.3",
+      "Version": "1.0.9",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "32e79b908fda56ee57fe518a8d37b864",
-      "Requirements": []
+      "Requirements": [
+        "methods",
+        "utils"
+      ],
+      "Hash": "e9c08b94391e9f3f97355841229124f2"
     },
     "SqlRender": {
       "Package": "SqlRender",
-      "Version": "1.9.0",
+      "Version": "1.11.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "b36617ebfe48f2463dc451086e6eea7f",
       "Requirements": [
+        "checkmate",
         "rJava",
         "rlang"
-      ]
+      ],
+      "Hash": "9c67a0caeab9c6340bf51e3d1aea81ea"
+    },
+    "askpass": {
+      "Package": "askpass",
+      "Version": "1.1",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "sys"
+      ],
+      "Hash": "e8a22846fff485f0be3770c2da758713"
+    },
+    "assertthat": {
+      "Package": "assertthat",
+      "Version": "0.2.1",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "tools"
+      ],
+      "Hash": "50c838a310445e954bc13f26f26a6ecf"
     },
     "backports": {
       "Package": "backports",
-      "Version": "1.4.0",
+      "Version": "1.4.1",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "00c7752ce37466d4a74774bcca1a507c",
-      "Requirements": []
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "c39fbec8a30d23e721980b8afb31984c"
     },
     "base64enc": {
       "Package": "base64enc",
       "Version": "0.1-3",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "543776ae6848fde2f48ff3816d0628bc",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "543776ae6848fde2f48ff3816d0628bc"
     },
     "bit": {
       "Package": "bit",
-      "Version": "4.0.4",
+      "Version": "4.0.5",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "f36715f14d94678eea9933af927bc15d",
-      "Requirements": []
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "d242abec29412ce988848d0294b208fd"
     },
     "bit64": {
       "Package": "bit64",
       "Version": "4.0.5",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "9fe98599ca456d6552421db0d6772d8f",
       "Requirements": [
-        "bit"
-      ]
+        "R",
+        "bit",
+        "methods",
+        "stats",
+        "utils"
+      ],
+      "Hash": "9fe98599ca456d6552421db0d6772d8f"
     },
     "brio": {
       "Package": "brio",
-      "Version": "1.1.3",
+      "Version": "1.1.0",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "976cf154dfb043c012d87cddd8bca363",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [],
+      "Hash": "570a24963009b9cce0869a0463c83580"
     },
     "bslib": {
       "Package": "bslib",
-      "Version": "0.3.1",
+      "Version": "0.4.1",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "56ae7e1987b340186a8a5a157c2ec358",
       "Requirements": [
+        "R",
+        "cachem",
+        "grDevices",
         "htmltools",
         "jquerylib",
         "jsonlite",
+        "memoise",
         "rlang",
         "sass"
-      ]
+      ],
+      "Hash": "89a0cd0c45161e3bd1c1e74a2d65e516"
     },
     "cachem": {
       "Package": "cachem",
       "Version": "1.0.6",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "648c5b3d71e6a37e3043617489a0a0e9",
       "Requirements": [
         "fastmap",
         "rlang"
-      ]
+      ],
+      "Hash": "648c5b3d71e6a37e3043617489a0a0e9"
     },
     "callr": {
       "Package": "callr",
-      "Version": "3.7.0",
+      "Version": "3.5.1",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "461aa75a11ce2400245190ef5d3995df",
+      "Repository": "RSPM",
       "Requirements": [
         "R6",
-        "processx"
-      ]
+        "processx",
+        "utils"
+      ],
+      "Hash": "b7d7f1e926dfcd57c74ce93f5c048e80"
     },
     "checkmate": {
       "Package": "checkmate",
-      "Version": "2.0.0",
+      "Version": "2.1.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "a667800d5f0350371bedeb8b8b950289",
       "Requirements": [
-        "backports"
-      ]
+        "R",
+        "backports",
+        "utils"
+      ],
+      "Hash": "147e4db6909d8814bb30f671b49d7e06"
     },
     "cli": {
       "Package": "cli",
-      "Version": "3.3.0",
+      "Version": "3.4.1",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "23abf173c2b783dcc43379ab9bba00ee",
       "Requirements": [
-        "glue"
-      ]
+        "R",
+        "utils"
+      ],
+      "Hash": "0d297d01734d2bcea40197bd4971a764"
     },
     "clipr": {
       "Package": "clipr",
-      "Version": "0.7.1",
+      "Version": "0.8.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "ebaa97ac99cc2daf04e77eecc7b781d7",
-      "Requirements": []
+      "Requirements": [
+        "utils"
+      ],
+      "Hash": "3f038e5ac7f41d4ac41ce658c85e3042"
     },
     "colorspace": {
       "Package": "colorspace",
-      "Version": "2.0-2",
+      "Version": "2.0-0",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "6baccb763ee83c0bd313460fdb8b8a84",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "grDevices",
+        "graphics",
+        "methods",
+        "stats"
+      ],
+      "Hash": "abea3384649ef37f60ef51ce002f3547"
     },
     "commonmark": {
       "Package": "commonmark",
       "Version": "1.7",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "0f22be39ec1d141fd03683c06f3a6e67",
-      "Requirements": []
+      "Requirements": [],
+      "Hash": "0f22be39ec1d141fd03683c06f3a6e67"
     },
     "cpp11": {
       "Package": "cpp11",
-      "Version": "0.4.2",
+      "Version": "0.4.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "fa53ce256cd280f468c080a58ea5ba8c",
-      "Requirements": []
+      "Requirements": [],
+      "Hash": "ed588261931ee3be2c700d22e94a29ab"
     },
     "crayon": {
       "Package": "crayon",
-      "Version": "1.4.2",
+      "Version": "1.5.2",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "0a6a65d92bd45b47b94b84244b528d17",
-      "Requirements": []
+      "Requirements": [
+        "grDevices",
+        "methods",
+        "utils"
+      ],
+      "Hash": "e8a1e41acf02548751f45c718d55aa6a"
     },
     "desc": {
       "Package": "desc",
-      "Version": "1.4.0",
+      "Version": "1.2.0",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "28763d08fadd0b733e3cee9dab4e12fe",
+      "Repository": "RSPM",
       "Requirements": [
+        "R",
         "R6",
+        "assertthat",
         "crayon",
-        "rprojroot"
-      ]
+        "rprojroot",
+        "utils"
+      ],
+      "Hash": "6c8fe8fa26a23b79949375d372c7b395"
     },
     "diffobj": {
       "Package": "diffobj",
-      "Version": "0.3.5",
+      "Version": "0.3.2",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "bcaa8b95f8d7d01a5dedfd959ce88ab8",
+      "Repository": "RSPM",
       "Requirements": [
-        "crayon"
-      ]
+        "R",
+        "crayon",
+        "methods",
+        "stats",
+        "tools",
+        "utils"
+      ],
+      "Hash": "16533929cf545f3c9b796780cccf5eff"
     },
     "digest": {
       "Package": "digest",
-      "Version": "0.6.28",
+      "Version": "0.6.27",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "49b5c6e230bfec487b8917d5a0c77cca",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "utils"
+      ],
+      "Hash": "a0cbe758a531d054b537d16dff4d58a1"
     },
     "dplyr": {
       "Package": "dplyr",
-      "Version": "1.0.8",
+      "Version": "1.0.2",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "ef47665e64228a17609d6df877bf86f2",
+      "Repository": "RSPM",
       "Requirements": [
+        "R",
         "R6",
+        "ellipsis",
         "generics",
         "glue",
         "lifecycle",
         "magrittr",
-        "pillar",
+        "methods",
         "rlang",
         "tibble",
         "tidyselect",
+        "utils",
         "vctrs"
-      ]
+      ],
+      "Hash": "d0509913b27ea898189ee664b6030dc2"
     },
     "ellipsis": {
       "Package": "ellipsis",
       "Version": "0.3.2",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077",
       "Requirements": [
+        "R",
         "rlang"
-      ]
+      ],
+      "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077"
     },
     "evaluate": {
       "Package": "evaluate",
       "Version": "0.14",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "ec8ca05cffcc70569eaaad8469d2a3a7",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "methods"
+      ],
+      "Hash": "ec8ca05cffcc70569eaaad8469d2a3a7"
     },
     "fansi": {
       "Package": "fansi",
-      "Version": "0.5.0",
+      "Version": "1.0.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "d447b40982c576a72b779f0a3b3da227",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "grDevices",
+        "utils"
+      ],
+      "Hash": "83a8afdbe71839506baa9f90eebad7ec"
     },
     "farver": {
       "Package": "farver",
-      "Version": "2.1.0",
+      "Version": "2.0.3",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "c98eb5133d9cb9e1622b8691487f11bb",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [],
+      "Hash": "dad6793a5a1f73c8e91f1a1e3e834b05"
     },
     "fastmap": {
       "Package": "fastmap",
       "Version": "1.1.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "77bd60a6157420d4ffa93b27cf6a58b8",
-      "Requirements": []
+      "Requirements": [],
+      "Hash": "77bd60a6157420d4ffa93b27cf6a58b8"
+    },
+    "filelock": {
+      "Package": "filelock",
+      "Version": "1.0.2",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [],
+      "Hash": "38ec653c2613bed60052ba3787bd8a2c"
     },
     "fontawesome": {
       "Package": "fontawesome",
-      "Version": "0.2.2",
+      "Version": "0.4.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "55624ed409e46c5f358b2c060be87f67",
       "Requirements": [
+        "R",
         "htmltools",
         "rlang"
-      ]
+      ],
+      "Hash": "c5a628c2570aa86a96cc6ef739d8bfda"
     },
     "fs": {
       "Package": "fs",
-      "Version": "1.5.1",
+      "Version": "1.5.0",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "8142f0a2056d53ec2e15bf701185beb1",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "methods"
+      ],
+      "Hash": "44594a07a42e5f91fac9f93fda6d0109"
     },
     "generics": {
       "Package": "generics",
       "Version": "0.1.2",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "177475892cf4a55865868527654a7741",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "methods"
+      ],
+      "Hash": "177475892cf4a55865868527654a7741"
+    },
+    "getPass": {
+      "Package": "getPass",
+      "Version": "0.2-2",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "R",
+        "rstudioapi",
+        "utils"
+      ],
+      "Hash": "07a91f99e56951818ab911366db77700"
+    },
+    "ggh4x": {
+      "Package": "ggh4x",
+      "Version": "0.2.3",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "cli",
+        "ggplot2",
+        "grid",
+        "gtable",
+        "lifecycle",
+        "rlang",
+        "scales",
+        "stats",
+        "vctrs"
+      ],
+      "Hash": "12a9567dfa0194970dde0a3089bd7efe"
     },
     "ggiraph": {
       "Package": "ggiraph",
-      "Version": "0.8.1",
+      "Version": "0.8.3",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "d2275ef01162b33c3808082268def8fc",
+      "Repository": "RSPM",
       "Requirements": [
         "Rcpp",
         "ggplot2",
+        "grid",
         "htmltools",
         "htmlwidgets",
         "purrr",
         "rlang",
+        "stats",
         "systemfonts",
         "uuid"
-      ]
+      ],
+      "Hash": "f584bc4dd1ab1c65e40437fce876578e"
     },
     "ggplot2": {
       "Package": "ggplot2",
-      "Version": "3.3.5",
+      "Version": "3.4.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "d7566c471c7b17e095dd023b9ef155ad",
       "Requirements": [
         "MASS",
-        "digest",
+        "R",
+        "cli",
         "glue",
+        "grDevices",
+        "grid",
         "gtable",
         "isoband",
+        "lifecycle",
         "mgcv",
         "rlang",
         "scales",
+        "stats",
         "tibble",
+        "vctrs",
         "withr"
-      ]
+      ],
+      "Hash": "fd2aab12f54400c6bca43687231e246b"
     },
     "glue": {
       "Package": "glue",
       "Version": "1.6.2",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "4f2596dfb05dac67b9dc558e5c6fba2e",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "methods"
+      ],
+      "Hash": "4f2596dfb05dac67b9dc558e5c6fba2e"
     },
     "gtable": {
       "Package": "gtable",
-      "Version": "0.3.0",
+      "Version": "0.3.1",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "ac5c6baf7822ce8732b343f14c072c4d",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "grid"
+      ],
+      "Hash": "36b4265fb818f6a342bed217549cd896"
     },
     "hms": {
       "Package": "hms",
-      "Version": "1.1.1",
+      "Version": "1.1.2",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "5b8a2dd0fdbe2ab4f6081e6c7be6dfca",
       "Requirements": [
         "ellipsis",
         "lifecycle",
+        "methods",
         "pkgconfig",
         "rlang",
         "vctrs"
-      ]
+      ],
+      "Hash": "41100392191e1244b887878b533eea91"
     },
     "htmltools": {
       "Package": "htmltools",
-      "Version": "0.5.2",
+      "Version": "0.5.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "526c484233f42522278ab06fb185cb26",
       "Requirements": [
+        "R",
         "base64enc",
         "digest",
         "fastmap",
-        "rlang"
-      ]
+        "grDevices",
+        "rlang",
+        "utils"
+      ],
+      "Hash": "6496090a9e00f8354b811d1a2d47b566"
     },
     "htmlwidgets": {
       "Package": "htmlwidgets",
-      "Version": "1.5.4",
+      "Version": "1.5.3",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "76147821cd3fcd8c4b04e1ef0498e7fb",
+      "Repository": "RSPM",
       "Requirements": [
+        "grDevices",
         "htmltools",
         "jsonlite",
         "yaml"
-      ]
+      ],
+      "Hash": "6fdaa86d0700f8b3e92ee3c445a5a10d"
     },
     "httpuv": {
       "Package": "httpuv",
-      "Version": "1.6.5",
+      "Version": "1.5.4",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "97fe71f0a4a1c9890e6c2128afa04bc0",
+      "Repository": "RSPM",
       "Requirements": [
+        "BH",
+        "R",
         "R6",
         "Rcpp",
         "later",
-        "promises"
-      ]
+        "promises",
+        "utils"
+      ],
+      "Hash": "4e6dabb220b006ccdc3b3b5ff993b205"
     },
     "isoband": {
       "Package": "isoband",
-      "Version": "0.2.5",
+      "Version": "0.2.3",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "7ab57a6de7f48a8dc84910d1eca42883",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "grid",
+        "testthat",
+        "utils"
+      ],
+      "Hash": "53647fb507373700028b2ce6cd30751a"
     },
     "jquerylib": {
       "Package": "jquerylib",
-      "Version": "0.1.4",
+      "Version": "0.1.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "5aab57a3bd297eee1c1d862735972182",
       "Requirements": [
         "htmltools"
-      ]
+      ],
+      "Hash": "5ff50b36f7f0832f8421745af333e73c"
     },
     "jsonlite": {
       "Package": "jsonlite",
-      "Version": "1.7.2",
+      "Version": "1.8.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "98138e0994d41508c7a6b84a0600cfcb",
-      "Requirements": []
+      "Requirements": [
+        "methods"
+      ],
+      "Hash": "d07e729b27b372429d42d24d503613a0"
+    },
+    "keyring": {
+      "Package": "keyring",
+      "Version": "1.1.0",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "R6",
+        "assertthat",
+        "filelock",
+        "getPass",
+        "openssl",
+        "rappdirs",
+        "sodium",
+        "tools",
+        "utils",
+        "yaml"
+      ],
+      "Hash": "67879ff7bee13ebec7fc9244fabf4be9"
     },
     "labeling": {
       "Package": "labeling",
       "Version": "0.4.2",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "3d5108641f47470611a32d0bdf357a72",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "graphics",
+        "stats"
+      ],
+      "Hash": "3d5108641f47470611a32d0bdf357a72"
     },
     "later": {
       "Package": "later",
-      "Version": "1.3.0",
+      "Version": "1.1.0.1",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "7e7b457d7766bc47f2a5f21cc2984f8e",
+      "Repository": "RSPM",
       "Requirements": [
+        "BH",
         "Rcpp",
         "rlang"
-      ]
+      ],
+      "Hash": "d0a62b247165aabf397fded504660d8a"
     },
     "lattice": {
       "Package": "lattice",
-      "Version": "0.20-45",
+      "Version": "0.20-41",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "b64cdbb2b340437c4ee047a1f4c4377b",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "grDevices",
+        "graphics",
+        "grid",
+        "stats",
+        "utils"
+      ],
+      "Hash": "fbd9285028b0263d76d18c95ae51a53d"
     },
     "lifecycle": {
       "Package": "lifecycle",
-      "Version": "1.0.1",
+      "Version": "1.0.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "a6b6d352e3ed897373ab19d8395c98d0",
       "Requirements": [
+        "R",
+        "cli",
         "glue",
         "rlang"
-      ]
+      ],
+      "Hash": "001cecbeac1cff9301bdc3775ee46a86"
     },
     "lubridate": {
       "Package": "lubridate",
       "Version": "1.8.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "2ff5eedb6ee38fb1b81205c73be1be5a",
       "Requirements": [
+        "R",
         "cpp11",
-        "generics"
-      ]
+        "generics",
+        "methods"
+      ],
+      "Hash": "2ff5eedb6ee38fb1b81205c73be1be5a"
     },
     "magrittr": {
       "Package": "magrittr",
-      "Version": "2.0.1",
+      "Version": "2.0.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "41287f1ac7d28a92f0a286ed507928d3",
-      "Requirements": []
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "7ce2733a9826b3aeb1775d56fd305472"
     },
     "markdown": {
       "Package": "markdown",
       "Version": "1.1",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "61e4a10781dd00d7d81dd06ca9b94e95",
+      "Repository": "RSPM",
       "Requirements": [
+        "R",
         "mime",
+        "utils",
         "xfun"
-      ]
+      ],
+      "Hash": "61e4a10781dd00d7d81dd06ca9b94e95"
     },
     "markdownInput": {
       "Package": "markdownInput",
       "Version": "0.1.2",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "0fc45179b8fda69e2a62a093640916d4",
       "Requirements": [
         "markdown",
         "shiny",
         "shinyAce"
-      ]
+      ],
+      "Hash": "0fc45179b8fda69e2a62a093640916d4"
+    },
+    "memoise": {
+      "Package": "memoise",
+      "Version": "2.0.1",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "cachem",
+        "rlang"
+      ],
+      "Hash": "e2817ccf4a065c5d9d7f2cfbe7c1d78c"
     },
     "mgcv": {
       "Package": "mgcv",
-      "Version": "1.8-39",
+      "Version": "1.8-33",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "055265005c238024e306fe0b600c89ff",
       "Requirements": [
         "Matrix",
-        "nlme"
-      ]
+        "R",
+        "graphics",
+        "methods",
+        "nlme",
+        "splines",
+        "stats",
+        "utils"
+      ],
+      "Hash": "eb7b6439bc6d812eed2cddba5edc6be3"
     },
     "mime": {
       "Package": "mime",
-      "Version": "0.12",
+      "Version": "0.9",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "18e9c28c1d3ca1560ce30658b22ce104",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "tools"
+      ],
+      "Hash": "e87a35ec73b157552814869f45a63aa3"
     },
     "munsell": {
       "Package": "munsell",
       "Version": "0.5.0",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "6dfe8bf774944bd5595785e3229d8771",
+      "Repository": "RSPM",
       "Requirements": [
-        "colorspace"
-      ]
+        "colorspace",
+        "methods"
+      ],
+      "Hash": "6dfe8bf774944bd5595785e3229d8771"
     },
     "nlme": {
       "Package": "nlme",
-      "Version": "3.1-155",
+      "Version": "3.1-149",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "74ad940dccc9e977189a5afe5fcdb7ba",
       "Requirements": [
-        "lattice"
-      ]
+        "R",
+        "graphics",
+        "lattice",
+        "stats",
+        "utils"
+      ],
+      "Hash": "7c24ab3a1e3afe50388eb2d893aab255"
+    },
+    "openssl": {
+      "Package": "openssl",
+      "Version": "1.4.3",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "askpass"
+      ],
+      "Hash": "a399e4773075fc2375b71f45fca186c4"
     },
     "pillar": {
       "Package": "pillar",
-      "Version": "1.6.4",
+      "Version": "1.8.1",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "60200b6aa32314ac457d3efbb5ccbd98",
       "Requirements": [
         "cli",
-        "crayon",
-        "ellipsis",
         "fansi",
+        "glue",
         "lifecycle",
         "rlang",
         "utf8",
+        "utils",
         "vctrs"
-      ]
+      ],
+      "Hash": "f2316df30902c81729ae9de95ad5a608"
+    },
+    "pkgbuild": {
+      "Package": "pkgbuild",
+      "Version": "1.1.0",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "R6",
+        "callr",
+        "cli",
+        "crayon",
+        "desc",
+        "prettyunits",
+        "rprojroot",
+        "withr"
+      ],
+      "Hash": "404684bc4e3685007f9720adf13b06c1"
     },
     "pkgconfig": {
       "Package": "pkgconfig",
       "Version": "2.0.3",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "01f28d4278f15c76cddbea05899c5d6f",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "utils"
+      ],
+      "Hash": "01f28d4278f15c76cddbea05899c5d6f"
     },
     "pkgload": {
       "Package": "pkgload",
-      "Version": "1.2.4",
+      "Version": "1.1.0",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "7533cd805940821bf23eaf3c8d4c1735",
+      "Repository": "RSPM",
       "Requirements": [
         "cli",
         "crayon",
         "desc",
+        "methods",
+        "pkgbuild",
         "rlang",
         "rprojroot",
         "rstudioapi",
+        "utils",
         "withr"
-      ]
-    },
-    "plyr": {
-      "Package": "plyr",
-      "Version": "1.8.6",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "ec0e5ab4e5f851f6ef32cd1d1984957f",
-      "Requirements": [
-        "Rcpp"
-      ]
+      ],
+      "Hash": "b6b150cd4709e0c0c9b5d51ac4376282"
     },
     "pool": {
       "Package": "pool",
-      "Version": "0.1.6",
+      "Version": "0.1.5",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "adbd1934555da2c62338acd48ad957f5",
       "Requirements": [
         "DBI",
+        "R",
         "R6",
-        "later"
-      ]
+        "later",
+        "methods"
+      ],
+      "Hash": "73805281d4775a4849b83b5796457f17"
     },
     "praise": {
       "Package": "praise",
       "Version": "1.0.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "a555924add98c99d2f411e37e7d25e9f",
-      "Requirements": []
+      "Requirements": [],
+      "Hash": "a555924add98c99d2f411e37e7d25e9f"
     },
     "prettyunits": {
       "Package": "prettyunits",
       "Version": "1.1.1",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "95ef9167b75dde9d2ccc3c7528393e7e",
-      "Requirements": []
+      "Requirements": [],
+      "Hash": "95ef9167b75dde9d2ccc3c7528393e7e"
     },
     "processx": {
       "Package": "processx",
-      "Version": "3.5.2",
+      "Version": "3.4.5",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "0cbca2bc4d16525d009c4dbba156b37c",
+      "Repository": "RSPM",
       "Requirements": [
         "R6",
-        "ps"
-      ]
+        "ps",
+        "utils"
+      ],
+      "Hash": "22aab6098cb14edd0a5973a8438b569b"
     },
     "progress": {
       "Package": "progress",
       "Version": "1.2.2",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "14dc9f7a3c91ebb14ec5bb9208a07061",
       "Requirements": [
         "R6",
         "crayon",
         "hms",
         "prettyunits"
-      ]
+      ],
+      "Hash": "14dc9f7a3c91ebb14ec5bb9208a07061"
     },
     "promises": {
       "Package": "promises",
-      "Version": "1.2.0.1",
+      "Version": "1.1.1",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "4ab2c43adb4d4699cf3690acd378d75d",
+      "Repository": "RSPM",
       "Requirements": [
         "R6",
         "Rcpp",
         "later",
         "magrittr",
-        "rlang"
-      ]
+        "rlang",
+        "stats"
+      ],
+      "Hash": "a8730dcbdd19f9047774909f0ec214a4"
     },
     "ps": {
       "Package": "ps",
-      "Version": "1.6.0",
+      "Version": "1.5.0",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "32620e2001c1dce1af49c49dccbb9420",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "utils"
+      ],
+      "Hash": "ebaed51a03411fd5cfc1e12d9079b353"
     },
     "purrr": {
       "Package": "purrr",
       "Version": "0.3.4",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "97def703420c8ab10d8f0e6c72101e02",
+      "Repository": "RSPM",
       "Requirements": [
+        "R",
         "magrittr",
         "rlang"
-      ]
+      ],
+      "Hash": "97def703420c8ab10d8f0e6c72101e02"
     },
     "rJava": {
       "Package": "rJava",
       "Version": "1.0-6",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "0415819f6baa75d86d52483f7292b623",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "methods"
+      ],
+      "Hash": "0415819f6baa75d86d52483f7292b623"
     },
     "rappdirs": {
       "Package": "rappdirs",
-      "Version": "0.3.3",
+      "Version": "0.3.1",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "5e3c5dc0b071b21fa128676560dbe94d",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "methods"
+      ],
+      "Hash": "8c8298583adbbe76f3c2220eef71bebc"
     },
     "reactR": {
       "Package": "reactR",
       "Version": "0.4.4",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "75389c8091eb14ee21c6bc87a88b3809",
       "Requirements": [
         "htmltools"
-      ]
+      ],
+      "Hash": "75389c8091eb14ee21c6bc87a88b3809"
     },
     "reactable": {
       "Package": "reactable",
-      "Version": "0.2.3",
+      "Version": "0.3.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "ac1afe50d1c77470a72971a07fd146b1",
       "Requirements": [
+        "R",
         "digest",
         "htmltools",
         "htmlwidgets",
         "jsonlite",
         "reactR"
-      ]
+      ],
+      "Hash": "377c52754f3e6c17673c79740e9296d7"
     },
     "readr": {
       "Package": "readr",
-      "Version": "2.1.2",
+      "Version": "2.1.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "9c59de1357dc209868b5feb5c9f0fe2f",
       "Requirements": [
+        "R",
         "R6",
         "cli",
         "clipr",
@@ -806,91 +1072,104 @@
         "crayon",
         "hms",
         "lifecycle",
+        "methods",
         "rlang",
         "tibble",
         "tzdb",
+        "utils",
         "vroom"
-      ]
+      ],
+      "Hash": "2dfbfc673ccb3de3d8836b4b3bd23d14"
     },
     "rematch2": {
       "Package": "rematch2",
       "Version": "2.1.2",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "76c9e04c712a05848ae7a23d2f170a40",
       "Requirements": [
         "tibble"
-      ]
+      ],
+      "Hash": "76c9e04c712a05848ae7a23d2f170a40"
     },
     "renv": {
       "Package": "renv",
-      "Version": "0.15.4",
+      "Version": "0.16.0-38.0.0.0.1669947056",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "c1078316e1d4f70275fc1ea60c0bc431",
-      "Requirements": []
+      "Repository": "RSPM",
+      "RemoteSha": "21f7cba4d28d62d4fe711e7f229acdba02a1f7ac",
+      "Requirements": [
+        "utils"
+      ],
+      "Hash": "d7904288deb5d0f2544baa5001790e01"
     },
     "rlang": {
       "Package": "rlang",
-      "Version": "1.0.2",
+      "Version": "1.0.6",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "04884d9a75d778aca22c7154b8333ec9",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "utils"
+      ],
+      "Hash": "4ed1f8336c8d52c3e750adcdc57228a7"
     },
     "rprojroot": {
       "Package": "rprojroot",
       "Version": "2.0.2",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "249d8cd1e74a8f6a26194a91b47f21d1",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "249d8cd1e74a8f6a26194a91b47f21d1"
     },
     "rstudioapi": {
       "Package": "rstudioapi",
       "Version": "0.13",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "06c85365a03fdaf699966cc1d3cf53ea",
-      "Requirements": []
+      "Requirements": [],
+      "Hash": "06c85365a03fdaf699966cc1d3cf53ea"
     },
     "sass": {
       "Package": "sass",
-      "Version": "0.4.0",
+      "Version": "0.4.4",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "50cf822feb64bb3977bda0b7091be623",
       "Requirements": [
         "R6",
         "fs",
         "htmltools",
         "rappdirs",
         "rlang"
-      ]
+      ],
+      "Hash": "c76cbac7ca04ce82d8c38e29729987a3"
     },
     "scales": {
       "Package": "scales",
-      "Version": "1.1.1",
+      "Version": "1.2.1",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "6f76f71042411426ec8df6c54f34e6dd",
+      "Repository": "RSPM",
       "Requirements": [
+        "R",
         "R6",
         "RColorBrewer",
         "farver",
         "labeling",
         "lifecycle",
         "munsell",
+        "rlang",
         "viridisLite"
-      ]
+      ],
+      "Hash": "906cb23d2f1c5680b8ce439b44c6fa63"
     },
     "shiny": {
       "Package": "shiny",
-      "Version": "1.7.1",
+      "Version": "1.7.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "00344c227c7bd0ab5d78052c5d736c44",
       "Requirements": [
+        "R",
         "R6",
         "bslib",
         "cachem",
@@ -900,113 +1179,156 @@
         "fastmap",
         "fontawesome",
         "glue",
+        "grDevices",
         "htmltools",
         "httpuv",
         "jsonlite",
         "later",
         "lifecycle",
+        "methods",
         "mime",
         "promises",
         "rlang",
         "sourcetools",
+        "tools",
+        "utils",
         "withr",
         "xtable"
-      ]
+      ],
+      "Hash": "fe12df67fdb3b1142325cc54f100cc06"
     },
     "shinyAce": {
       "Package": "shinyAce",
       "Version": "0.4.1",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "402073a8a045c9f5ea096ed94e01d9ce",
+      "Repository": "RSPM",
       "Requirements": [
+        "R",
         "jsonlite",
-        "shiny"
-      ]
+        "shiny",
+        "tools",
+        "utils"
+      ],
+      "Hash": "402073a8a045c9f5ea096ed94e01d9ce"
     },
     "shinyWidgets": {
       "Package": "shinyWidgets",
-      "Version": "0.6.3",
+      "Version": "0.6.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "89b90f439e5a824f8bcbadd082106902",
       "Requirements": [
+        "R",
         "bslib",
+        "grDevices",
         "htmltools",
         "jsonlite",
         "sass",
         "shiny"
-      ]
+      ],
+      "Hash": "7dd5f3ee96c64a47fdbc6e437ff1c7e1"
     },
     "shinycssloaders": {
       "Package": "shinycssloaders",
       "Version": "1.0.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "f39bb3c44a9b496723ec7e86f9a771d8",
       "Requirements": [
+        "R",
         "digest",
         "glue",
+        "grDevices",
         "shiny"
-      ]
+      ],
+      "Hash": "f39bb3c44a9b496723ec7e86f9a771d8"
     },
     "shinydashboard": {
       "Package": "shinydashboard",
-      "Version": "0.7.2",
+      "Version": "0.7.1",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "e418b532e9bb4eb22a714b9a9f1acee7",
       "Requirements": [
+        "R",
         "htmltools",
         "promises",
-        "shiny"
-      ]
+        "shiny",
+        "utils"
+      ],
+      "Hash": "133639dc106955eee4ffb8ec73edac37"
+    },
+    "sodium": {
+      "Package": "sodium",
+      "Version": "1.1",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [],
+      "Hash": "9f07fda8802e9a2ed7e91f20f2d814ce"
     },
     "sourcetools": {
       "Package": "sourcetools",
       "Version": "0.1.7",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "947e4e02a79effa5d512473e10f41797",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "947e4e02a79effa5d512473e10f41797"
     },
     "stringi": {
       "Package": "stringi",
-      "Version": "1.7.6",
+      "Version": "1.7.8",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "bba431031d30789535745a9627ac9271",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "stats",
+        "tools",
+        "utils"
+      ],
+      "Hash": "a68b980681bcbc84c7a67003fa796bfb"
     },
     "stringr": {
       "Package": "stringr",
-      "Version": "1.4.0",
+      "Version": "1.5.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "0759e6b6c0957edb1311028a49a35e76",
       "Requirements": [
+        "R",
+        "cli",
         "glue",
+        "lifecycle",
         "magrittr",
-        "stringi"
-      ]
+        "rlang",
+        "stringi",
+        "vctrs"
+      ],
+      "Hash": "671a4d384ae9d32fc47a14e98bfa3dc8"
+    },
+    "sys": {
+      "Package": "sys",
+      "Version": "3.4",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [],
+      "Hash": "b227d13e29222b4574486cfcbde077fa"
     },
     "systemfonts": {
       "Package": "systemfonts",
-      "Version": "1.0.3",
+      "Version": "1.0.4",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "5be9fcf8ef6763e8cb13ab009e273a1d",
       "Requirements": [
+        "R",
         "cpp11"
-      ]
+      ],
+      "Hash": "90b28393209827327de889f49935140a"
     },
     "testthat": {
       "Package": "testthat",
-      "Version": "3.1.4",
+      "Version": "3.0.0",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "f76c2a02d0fdc24aa7a47ea34261a6e3",
+      "Repository": "RSPM",
       "Requirements": [
+        "R",
         "R6",
         "brio",
         "callr",
@@ -1019,39 +1341,44 @@
         "jsonlite",
         "lifecycle",
         "magrittr",
+        "methods",
         "pkgload",
         "praise",
         "processx",
         "ps",
         "rlang",
+        "utils",
         "waldo",
         "withr"
-      ]
+      ],
+      "Hash": "13298cedd051cb7b8a8972d380b559a6"
     },
     "tibble": {
       "Package": "tibble",
-      "Version": "3.1.6",
+      "Version": "3.1.8",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "8a8f02d1934dfd6431c671361510dd0b",
       "Requirements": [
-        "ellipsis",
+        "R",
         "fansi",
         "lifecycle",
         "magrittr",
+        "methods",
         "pillar",
         "pkgconfig",
         "rlang",
+        "utils",
         "vctrs"
-      ]
+      ],
+      "Hash": "56b6934ef0f8c68225949a8672fe1a8f"
     },
     "tidyr": {
       "Package": "tidyr",
       "Version": "1.2.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "d8b95b7fee945d7da6888cf7eb71a49c",
       "Requirements": [
+        "R",
         "cpp11",
         "dplyr",
         "ellipsis",
@@ -1062,97 +1389,112 @@
         "rlang",
         "tibble",
         "tidyselect",
+        "utils",
         "vctrs"
-      ]
+      ],
+      "Hash": "d8b95b7fee945d7da6888cf7eb71a49c"
     },
     "tidyselect": {
       "Package": "tidyselect",
-      "Version": "1.1.1",
+      "Version": "1.2.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "7243004a708d06d4716717fa1ff5b2fe",
       "Requirements": [
-        "ellipsis",
+        "R",
+        "cli",
         "glue",
-        "purrr",
+        "lifecycle",
         "rlang",
-        "vctrs"
-      ]
+        "vctrs",
+        "withr"
+      ],
+      "Hash": "79540e5fcd9e0435af547d885f184fd5"
     },
     "triebeard": {
       "Package": "triebeard",
       "Version": "0.3.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "847a9d113b78baca4a9a8639609ea228",
       "Requirements": [
         "Rcpp"
-      ]
+      ],
+      "Hash": "847a9d113b78baca4a9a8639609ea228"
     },
     "tzdb": {
       "Package": "tzdb",
       "Version": "0.3.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "b2e1cbce7c903eaf23ec05c58e59fb5e",
       "Requirements": [
+        "R",
         "cpp11"
-      ]
+      ],
+      "Hash": "b2e1cbce7c903eaf23ec05c58e59fb5e"
     },
     "urltools": {
       "Package": "urltools",
       "Version": "1.7.3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "e86a704261a105f4703f653e05defa3e",
       "Requirements": [
+        "R",
         "Rcpp",
+        "methods",
         "triebeard"
-      ]
+      ],
+      "Hash": "e86a704261a105f4703f653e05defa3e"
     },
     "utf8": {
       "Package": "utf8",
       "Version": "1.2.2",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "c9c462b759a5cc844ae25b5942654d13",
-      "Requirements": []
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "c9c462b759a5cc844ae25b5942654d13"
     },
     "uuid": {
       "Package": "uuid",
       "Version": "1.0-3",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "2097822ba5e4440b81a0c7525d0315ce",
-      "Requirements": []
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "2097822ba5e4440b81a0c7525d0315ce"
     },
     "vctrs": {
       "Package": "vctrs",
-      "Version": "0.3.8",
+      "Version": "0.5.1",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "ecf749a1b39ea72bd9b51b76292261f1",
       "Requirements": [
-        "ellipsis",
+        "R",
+        "cli",
         "glue",
+        "lifecycle",
         "rlang"
-      ]
+      ],
+      "Hash": "970324f6572b4fd81db507b5d4062cb0"
     },
     "viridisLite": {
       "Package": "viridisLite",
-      "Version": "0.4.0",
+      "Version": "0.3.0",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "55e157e2aa88161bdb0754218470d204",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R"
+      ],
+      "Hash": "ce4f6271baa94776db692f1cb2055bee"
     },
     "vroom": {
       "Package": "vroom",
-      "Version": "1.5.7",
+      "Version": "1.6.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "976507b5a105bc3bdf6a5a5f29e0684f",
       "Requirements": [
+        "R",
         "bit64",
         "cli",
         "cpp11",
@@ -1160,62 +1502,78 @@
         "glue",
         "hms",
         "lifecycle",
+        "methods",
         "progress",
         "rlang",
+        "stats",
         "tibble",
         "tidyselect",
         "tzdb",
         "vctrs",
         "withr"
-      ]
+      ],
+      "Hash": "64f81fdead6e0d250fb041e175d123ab"
     },
     "waldo": {
       "Package": "waldo",
-      "Version": "0.4.0",
+      "Version": "0.2.3",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "035fba89d0c86e2113120f93301b98ad",
+      "Repository": "RSPM",
       "Requirements": [
         "cli",
         "diffobj",
         "fansi",
         "glue",
+        "methods",
         "rematch2",
         "rlang",
         "tibble"
-      ]
+      ],
+      "Hash": "181d1a31b1ba2009ef20926f2ee0570c"
     },
     "withr": {
       "Package": "withr",
-      "Version": "2.4.3",
+      "Version": "2.5.0",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "a376b424c4817cda4920bbbeb3364e85",
-      "Requirements": []
+      "Requirements": [
+        "R",
+        "grDevices",
+        "graphics",
+        "stats"
+      ],
+      "Hash": "c0e49a9760983e81e55cdd9be92e7182"
     },
     "xfun": {
       "Package": "xfun",
-      "Version": "0.28",
+      "Version": "0.19",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "f7f3a61ab62cd046d307577a8ae12999",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "stats",
+        "tools"
+      ],
+      "Hash": "a42372606cb76f34da9d090326e9f955"
     },
     "xtable": {
       "Package": "xtable",
       "Version": "1.8-4",
       "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "b8acdf8af494d9ec19ccb2481a9b11c2",
-      "Requirements": []
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "stats",
+        "utils"
+      ],
+      "Hash": "b8acdf8af494d9ec19ccb2481a9b11c2"
     },
     "yaml": {
       "Package": "yaml",
-      "Version": "2.2.1",
+      "Version": "2.3.5",
       "Source": "Repository",
       "Repository": "CRAN",
-      "Hash": "2826c5d9efb0a88f657c7a679c7106db",
-      "Requirements": []
+      "Requirements": [],
+      "Hash": "458bb38374d73bf83b1bb85e353da200"
     }
   }
 }
diff --git a/inst/sql/postgresql/migrations/Migration_2-v3_1_0_ir_person_years.sql b/inst/sql/postgresql/migrations/Migration_2-v3_1_0_ir_person_years.sql
index 203dffc7a..c4bd31705 100644
--- a/inst/sql/postgresql/migrations/Migration_2-v3_1_0_ir_person_years.sql
+++ b/inst/sql/postgresql/migrations/Migration_2-v3_1_0_ir_person_years.sql
@@ -3,4 +3,4 @@
 {DEFAULT @incidence_rate = incidence_rate}
 {DEFAULT @table_prefix = ''}
 
-ALTER TABLE @database_schema.@table_prefix@incidence_rate ALTER COLUMN person_years TYPE NUMERIC;
\ No newline at end of file
+ALTER TABLE @database_schema.@table_prefix@incidence_rate ALTER COLUMN person_years TYPE NUMERIC;
diff --git a/inst/sql/sql_server/UpdateVersionNumber.sql b/inst/sql/sql_server/UpdateVersionNumber.sql
index 69df1001f..9bd9a9f9a 100644
--- a/inst/sql/sql_server/UpdateVersionNumber.sql
+++ b/inst/sql/sql_server/UpdateVersionNumber.sql
@@ -1,5 +1,6 @@
 {DEFAULT @package_version = package_version}
-{DEFAULT @version_number = '3.1.0'}
+{DEFAULT @version_number = '3.1.1'}
 
 DELETE FROM @database_schema.@table_prefix@package_version;
-INSERT INTO @database_schema.@table_prefix@package_version (version_number) VALUES ('@version_number');
\ No newline at end of file
+INSERT INTO @database_schema.@table_prefix@package_version (version_number) VALUES ('@version_number');
+
diff --git a/inst/sql/sql_server/migrations/Migration_2-v3_1_0_ir_person_years.sql b/inst/sql/sql_server/migrations/Migration_2-v3_1_0_ir_person_years.sql
index e1331c043..0b2bca184 100644
--- a/inst/sql/sql_server/migrations/Migration_2-v3_1_0_ir_person_years.sql
+++ b/inst/sql/sql_server/migrations/Migration_2-v3_1_0_ir_person_years.sql
@@ -3,4 +3,4 @@
 {DEFAULT @incidence_rate = incidence_rate}
 {DEFAULT @table_prefix = ''}
 
-ALTER TABLE @database_schema.@table_prefix@incidence_rate ALTER COLUMN person_years FLOAT;
\ No newline at end of file
+ALTER TABLE @database_schema.@table_prefix@incidence_rate ALTER COLUMN person_years FLOAT;
diff --git a/man/launchCohortExplorer.Rd b/man/launchCohortExplorer.Rd
deleted file mode 100644
index b7a426c6b..000000000
--- a/man/launchCohortExplorer.Rd
+++ /dev/null
@@ -1,43 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/Shiny.R
-\name{launchCohortExplorer}
-\alias{launchCohortExplorer}
-\title{Launch the CohortExplorer Shiny app}
-\usage{
-launchCohortExplorer(
-  connectionDetails,
-  cdmDatabaseSchema,
-  cohortDatabaseSchema,
-  cohortTable,
-  cohortId,
-  sampleSize = 100,
-  subjectIds = NULL
-)
-}
-\arguments{
-\item{connectionDetails}{An object of type \code{connectionDetails} as created using the
-\code{\link[DatabaseConnector]{createConnectionDetails}} function in the
-DatabaseConnector package.}
-
-\item{cdmDatabaseSchema}{Schema name where your patient-level data in OMOP CDM format resides.
-Note that for SQL Server, this should include both the database and
-schema name, for example 'cdm_data.dbo'.}
-
-\item{cohortDatabaseSchema}{Schema name where your cohort table resides. Note that for SQL Server,
-this should include both the database and schema name, for example
-'scratch.dbo'.}
-
-\item{cohortTable}{Name of the cohort table.}
-
-\item{cohortId}{The ID of the cohort.}
-
-\item{sampleSize}{Number of subjects to sample from the cohort. Ignored if subjectIds is specified.}
-
-\item{subjectIds}{A vector of subject IDs to view.}
-}
-\description{
-Launch the CohortExplorer Shiny app
-}
-\details{
-Launches a Shiny app that allows the user to explore a cohort of interest.
-}
diff --git a/tests/testthat/helper.R b/tests/testthat/helper.R
index ca49b9b84..83f77b8bb 100644
--- a/tests/testthat/helper.R
+++ b/tests/testthat/helper.R
@@ -35,7 +35,7 @@ loadTestCohortDefinitionSet <- function(cohortIds = NULL) {
     cohortFileNameValue = c("cohortId")
   )
   if (!is.null(cohortIds)) {
-    cohortDefinitionSet <- cohortDefinitionSet %>% dplyr::filter(.data$cohortId %in% cohortIds)
+    cohortDefinitionSet <- cohortDefinitionSet %>% dplyr::filter(cohortId %in% cohortIds)
   }
   
   cohortDefinitionSet$checksum <- computeChecksum(cohortDefinitionSet$sql)
diff --git a/tests/testthat/test-Characterization.R b/tests/testthat/test-Characterization.R
index 3954926cb..8690ad8e7 100644
--- a/tests/testthat/test-Characterization.R
+++ b/tests/testthat/test-Characterization.R
@@ -89,7 +89,7 @@ test_that("Execute and export characterization", {
     #should not have the cohorts that were previously run
     testthat::expect_equal(object = nrow(subset %>%
                                            dplyr::filter(
-                                             .data$cohortId %in% c(cohortDefinitionSet[1:3, ]$cohortId)
+                                             cohortId %in% c(cohortDefinitionSet[1:3, ]$cohortId)
                                            )),
                            expected = 0)
     
diff --git a/tests/testthat/test-ResultsDataModel.R b/tests/testthat/test-ResultsDataModel.R
index 52695defc..7a0af1790 100644
--- a/tests/testthat/test-ResultsDataModel.R
+++ b/tests/testthat/test-ResultsDataModel.R
@@ -251,9 +251,9 @@ test_that("Data removal works", {
         negate = TRUE
       )) {
         primaryKey <- specifications %>%
-          dplyr::filter(.data$tableName == !!tableName &
-            .data$primaryKey == "Yes") %>%
-          dplyr::select(.data$columnName) %>%
+          dplyr::filter(tableName == !!tableName &
+            primaryKey == "Yes") %>%
+          dplyr::select(columnName) %>%
           dplyr::pull()
 
         if ("database_id" %in% primaryKey) {
diff --git a/tests/testthat/test-moduleCohortRelationship.R b/tests/testthat/test-moduleCohortRelationship.R
index bc73bcedc..25d317fd4 100644
--- a/tests/testthat/test-moduleCohortRelationship.R
+++ b/tests/testthat/test-moduleCohortRelationship.R
@@ -65,12 +65,12 @@ test_that("Testing executeCohortRelationshipDiagnostics", {
     
     cohortDefinitionSet <-
       cohort %>%
-      dplyr::select(.data$cohortDefinitionId) %>%
+      dplyr::select(cohortDefinitionId) %>%
       dplyr::distinct() %>%
-      dplyr::rename(cohortId = .data$cohortDefinitionId) %>%
+      dplyr::rename(cohortId = cohortDefinitionId) %>%
       dplyr::rowwise() %>%
       dplyr::mutate(json = RJSONIO::toJSON(list(
-        cohortId = .data$cohortId,
+        cohortId = cohortId,
         randomString = c(
           sample(x = LETTERS, 5, replace = TRUE),
           sample(x = LETTERS, 4, replace = TRUE),
@@ -79,7 +79,7 @@ test_that("Testing executeCohortRelationshipDiagnostics", {
       ))) %>%
       dplyr::ungroup() %>%
       dplyr::mutate(sql = json,
-                    checksum = CohortDiagnostics:::computeChecksum(.data$json))
+                    checksum = CohortDiagnostics:::computeChecksum(json))
     
     
     exportFolder <- tempdir()
@@ -101,7 +101,7 @@ test_that("Testing executeCohortRelationshipDiagnostics", {
       cohortTable = tableName,
       tempEmulationSchema = NULL,
       cohortDefinitionSet = cohortDefinitionSet %>%
-        dplyr::filter(.data$cohortId %in% c(1, 10)),
+        dplyr::filter(cohortId %in% c(1, 10)),
       temporalCovariateSettings = list(
         temporalStartDays = c(-365, -30),
         temporalEndDays = c(-31, -1)
@@ -123,41 +123,41 @@ test_that("Testing executeCohortRelationshipDiagnostics", {
     
     testthat::expect_equal(
       object = recordKeepingFileData %>%
-        dplyr::filter(.data$cohortId == 1) %>%
-        dplyr::filter(.data$comparatorId == 10) %>%
-        dplyr::select(.data$checksum) %>%
-        dplyr::pull(.data$checksum),
+        dplyr::filter(cohortId == 1) %>%
+        dplyr::filter(comparatorId == 10) %>%
+        dplyr::select(checksum) %>%
+        dplyr::pull(checksum),
       expected = recordKeepingFileData %>%
-        dplyr::filter(.data$cohortId == 1) %>%
-        dplyr::filter(.data$comparatorId == 10) %>%
+        dplyr::filter(cohortId == 1) %>%
+        dplyr::filter(comparatorId == 10) %>%
         dplyr::mutate(
-          checksum2 = paste0(.data$targetChecksum,
-                             .data$comparatorChecksum)
+          checksum2 = paste0(targetChecksum,
+                             comparatorChecksum)
         ) %>%
-        dplyr::pull(.data$checksum2)
+        dplyr::pull(checksum2)
     )
     
     
     
     ## testing if subset works
     allCohortIds <- cohortDefinitionSet  %>%
-      dplyr::filter(.data$cohortId %in% c(1, 10, 2)) %>%
-      dplyr::select(.data$cohortId, .data$checksum) %>%
-      dplyr::rename(targetCohortId = .data$cohortId,
-                    targetChecksum = .data$checksum) %>%
+      dplyr::filter(cohortId %in% c(1, 10, 2)) %>%
+      dplyr::select(cohortId, checksum) %>%
+      dplyr::rename(targetCohortId = cohortId,
+                    targetChecksum = checksum) %>%
       dplyr::distinct()
     
     combinationsOfPossibleCohortRelationships <- allCohortIds %>%
       tidyr::crossing(
         allCohortIds %>%
           dplyr::rename(
-            comparatorCohortId = .data$targetCohortId,
-            comparatorChecksum = .data$targetChecksum
+            comparatorCohortId = targetCohortId,
+            comparatorChecksum = targetChecksum
           )
       ) %>%
-      dplyr::filter(.data$targetCohortId != .data$comparatorCohortId) %>%
-      dplyr::arrange(.data$targetCohortId, .data$comparatorCohortId) %>%
-      dplyr::mutate(checksum = paste0(.data$targetChecksum, .data$comparatorChecksum))
+      dplyr::filter(targetCohortId != comparatorCohortId) %>%
+      dplyr::arrange(targetCohortId, comparatorCohortId) %>%
+      dplyr::mutate(checksum = paste0(targetChecksum, comparatorChecksum))
     
     subset <- CohortDiagnostics:::subsetToRequiredCombis(
       combis = combinationsOfPossibleCohortRelationships,
@@ -170,11 +170,11 @@ test_that("Testing executeCohortRelationshipDiagnostics", {
     shouldBeDfOfZeroRows <- subset %>%
       dplyr::inner_join(
         recordKeepingFileData %>%
-          dplyr::select(.data$cohortId,
-                        .data$comparatorId) %>%
+          dplyr::select(cohortId,
+                        comparatorId) %>%
           dplyr::rename(
-            targetCohortId = .data$cohortId,
-            comparatorCohortId = .data$comparatorId
+            targetCohortId = cohortId,
+            comparatorCohortId = comparatorId
           ),
         by = c("targetCohortId", "comparatorCohortId")
       )
@@ -196,7 +196,7 @@ test_that("Testing executeCohortRelationshipDiagnostics", {
       cohortTable = tableName,
       tempEmulationSchema = NULL,
       cohortDefinitionSet = cohortDefinitionSet %>%
-        dplyr::filter(.data$cohortId %in% c(1, 10, 2)),
+        dplyr::filter(cohortId %in% c(1, 10, 2)),
       temporalCovariateSettings = list(
         temporalStartDays = c(-365, -30),
         temporalEndDays = c(-31, -1)
@@ -219,8 +219,8 @@ test_that("Testing executeCohortRelationshipDiagnostics", {
       object = recordKeepingFileData2 %>%
         dplyr::anti_join(
           recordKeepingFileData %>%
-            dplyr::select(.data$cohortId,
-                          .data$comparatorId),
+            dplyr::select(cohortId,
+                          comparatorId),
           by = c("cohortId", "comparatorId")
         ) %>%
         nrow(),
@@ -230,23 +230,23 @@ test_that("Testing executeCohortRelationshipDiagnostics", {
     
     # check what happens for an unrelated cohort combination
     allCohortIds <- cohortDefinitionSet  %>%
-      dplyr::filter(.data$cohortId %in% c(2, 20)) %>%
-      dplyr::select(.data$cohortId, .data$checksum) %>%
-      dplyr::rename(targetCohortId = .data$cohortId,
-                    targetChecksum = .data$checksum) %>%
+      dplyr::filter(cohortId %in% c(2, 20)) %>%
+      dplyr::select(cohortId, checksum) %>%
+      dplyr::rename(targetCohortId = cohortId,
+                    targetChecksum = checksum) %>%
       dplyr::distinct()
     
     combinationsOfPossibleCohortRelationships <- allCohortIds %>%
       tidyr::crossing(
         allCohortIds %>%
           dplyr::rename(
-            comparatorCohortId = .data$targetCohortId,
-            comparatorChecksum = .data$targetChecksum
+            comparatorCohortId = targetCohortId,
+            comparatorChecksum = targetChecksum
           )
       ) %>%
-      dplyr::filter(.data$targetCohortId != .data$comparatorCohortId) %>%
-      dplyr::arrange(.data$targetCohortId, .data$comparatorCohortId) %>%
-      dplyr::mutate(checksum = paste0(.data$targetChecksum, .data$comparatorChecksum))
+      dplyr::filter(targetCohortId != comparatorCohortId) %>%
+      dplyr::arrange(targetCohortId, comparatorCohortId) %>%
+      dplyr::mutate(checksum = paste0(targetChecksum, comparatorChecksum))
     
     subset <- CohortDiagnostics:::subsetToRequiredCombis(
       combis = combinationsOfPossibleCohortRelationships,
@@ -259,11 +259,11 @@ test_that("Testing executeCohortRelationshipDiagnostics", {
     shouldBeTwoRows <- subset %>%
       dplyr::anti_join(
         recordKeepingFileData2 %>%
-          dplyr::select(.data$cohortId,
-                        .data$comparatorId) %>%
+          dplyr::select(cohortId,
+                        comparatorId) %>%
           dplyr::rename(
-            targetCohortId = .data$cohortId,
-            comparatorCohortId = .data$comparatorId
+            targetCohortId = cohortId,
+            comparatorCohortId = comparatorId
           ),
         by = c("targetCohortId", "comparatorCohortId")
       )
@@ -363,8 +363,8 @@ test_that("Testing cohort relationship logic - incremental FALSE", {
     )
 
     cohortRelationshipT1C10 <- cohortRelationship %>%
-      dplyr::filter(.data$cohortId == 1) %>%
-      dplyr::filter(.data$comparatorCohortId == 10)
+      dplyr::filter(cohortId == 1) %>%
+      dplyr::filter(comparatorCohortId == 10)
 
     testthat::expect_equal(
       object = cohortRelationshipT1C10$subCsBeforeTs,
diff --git a/tests/testthat/test-moduleTimeSeries.R b/tests/testthat/test-moduleTimeSeries.R
index 8d3127064..fa238d77c 100644
--- a/tests/testthat/test-moduleTimeSeries.R
+++ b/tests/testthat/test-moduleTimeSeries.R
@@ -29,12 +29,12 @@ test_that("Testing cohort time series execution", {
     
     cohortDefinitionSet <-
       cohort %>%
-      dplyr::select(.data$cohortDefinitionId) %>%
+      dplyr::select(cohortDefinitionId) %>%
       dplyr::distinct() %>%
-      dplyr::rename(cohortId = .data$cohortDefinitionId) %>%
+      dplyr::rename(cohortId = cohortDefinitionId) %>%
       dplyr::rowwise() %>%
       dplyr::mutate(json = RJSONIO::toJSON(list(
-        cohortId = .data$cohortId,
+        cohortId = cohortId,
         randomString = c(
           sample(x = LETTERS, 5, replace = TRUE),
           sample(x = LETTERS, 4, replace = TRUE),
@@ -43,7 +43,7 @@ test_that("Testing cohort time series execution", {
       ))) %>%
       dplyr::ungroup() %>%
       dplyr::mutate(sql = json,
-                    checksum = as.character(CohortDiagnostics:::computeChecksum(.data$json))) %>%
+                    checksum = as.character(CohortDiagnostics:::computeChecksum(json))) %>%
       dplyr::ungroup()
     
     exportFolder <- tempdir()
@@ -80,7 +80,7 @@ test_that("Testing cohort time series execution", {
       cohortDatabaseSchema = cohortDatabaseSchema,
       cohortTable = cohortTable,
       cohortDefinitionSet = cohortDefinitionSet %>%
-        dplyr::filter(.data$cohortId %in% c(1, 2)),
+        dplyr::filter(cohortId %in% c(1, 2)),
       runCohortTimeSeries = TRUE,
       runDataSourceTimeSeries = FALSE,
       databaseId = "testDatabaseId",
@@ -116,7 +116,7 @@ test_that("Testing cohort time series execution", {
       incremental = TRUE,
       recordKeepingFile = paste0(exportFile, "recordKeeping")
     ) %>%
-      dplyr::arrange(.data$cohortId)
+      dplyr::arrange(cohortId)
     
     testthat::expect_equal(object = subset$cohortId,
                            expected = c(1000, 2000))
@@ -223,9 +223,9 @@ test_that("Testing time series logic", {
 
     # testing if values returned for cohort 1 is as expected
     timeSeriesCohort <- timeSeries %>%
-      dplyr::filter(.data$cohortId == 1) %>%
-      dplyr::filter(.data$seriesType == "T1") %>%
-      dplyr::filter(.data$calendarInterval == "m")
+      dplyr::filter(cohortId == 1) %>%
+      dplyr::filter(seriesType == "T1") %>%
+      dplyr::filter(calendarInterval == "m")
 
     # there should be 8 records in this data frame, representing 8 months for the one subject in the cohort id  = 1
     testthat::expect_equal(
@@ -235,13 +235,13 @@ test_that("Testing time series logic", {
 
     # there should be 2 records in this data frame, representing the 2 starts for the one subject in the cohort id  = 1
     testthat::expect_equal(
-      object = nrow(timeSeriesCohort %>% dplyr::filter(.data$recordsStart == 1)),
+      object = nrow(timeSeriesCohort %>% dplyr::filter(recordsStart == 1)),
       expected = 2
     )
 
     # there should be 1 records in this data frame, representing the 1 incident start for the one subject in the cohort id  = 1
     testthat::expect_equal(
-      object = nrow(timeSeriesCohort %>% dplyr::filter(.data$subjectsStartIn == 1)),
+      object = nrow(timeSeriesCohort %>% dplyr::filter(subjectsStartIn == 1)),
       expected = 1
     )
   })
@@ -312,7 +312,7 @@ test_that("Testing Data source time series execution", {
       incremental = TRUE,
       recordKeepingFile = paste0(exportFile, "recordKeeping")
     ) %>%
-      dplyr::arrange(.data$cohortId)
+      dplyr::arrange(cohortId)
     
     testthat::expect_equal(object = nrow(subset),
                            expected = 0)
diff --git a/tests/testthat/test-other.R b/tests/testthat/test-other.R
index 1a785ca1d..cf57588c3 100644
--- a/tests/testthat/test-other.R
+++ b/tests/testthat/test-other.R
@@ -17,8 +17,8 @@ test_that("Check function makeDataExportable", {
     SqlRender::camelCaseToSnakeCase(names(cohortCountTableCorrect)) %>% sort()
 
   resultsDataModel <- getResultsDataModelSpecifications() %>%
-    dplyr::filter(.data$tableName == "cohort_count") %>%
-    dplyr::select(.data$columnName) %>%
+    dplyr::filter(tableName == "cohort_count") %>%
+    dplyr::select(columnName) %>%
     dplyr::pull() %>%
     sort()