diff --git a/DESCRIPTION b/DESCRIPTION
index 3a313744..a6c31385 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -34,6 +34,7 @@ Imports:
     lifecycle (>= 0.2.0),
     shinyvalidate,
     teal.code (>= 0.4.1.9009),
+    teal.data (>= 0.3.0.9018),
     teal.logger (>= 0.2.0.9004),
     teal.reporter (>= 0.2.0),
     teal.widgets (>= 0.4.0),
@@ -44,7 +45,6 @@ Suggests:
     logger (>= 0.2.2),
     nestcolor (>= 0.1.0),
     rmarkdown (>= 2.23),
-    teal.data (>= 0.3.0.9018),
     testthat (>= 3.1.5),
     withr (>= 2.0.0)
 Config/Needs/verdepcheck: insightsengineering/osprey, rstudio/shiny,
diff --git a/NEWS.md b/NEWS.md
index f0afe4f8..79de4f64 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,7 @@
 # teal.osprey 0.1.16.9028
 
 * Removed `Show Warnings` modals from modules.
+* Moved `teal_data` from `Suggests` to `Imports` as it was used in `tm_g_swimlane`. Changed examples from `cdisc_data()` to `teal_data()`.
 
 ### Breaking Changes
 * Adapted all modules to use `teal_data` objects.
diff --git a/R/tm_g_ae_oview.R b/R/tm_g_ae_oview.R
index f4fc0fcc..364bbd5c 100644
--- a/R/tm_g_ae_oview.R
+++ b/R/tm_g_ae_oview.R
@@ -16,7 +16,7 @@
 #' @export
 #'
 #' @examplesIf require("nestcolor")
-#' data <- cdisc_data() |>
+#' data <- teal_data() |>
 #'   within({
 #'     library(nestcolor)
 #'     ADSL <- rADSL
diff --git a/R/tm_g_ae_sub.R b/R/tm_g_ae_sub.R
index f4333a3c..37c7f523 100644
--- a/R/tm_g_ae_sub.R
+++ b/R/tm_g_ae_sub.R
@@ -18,7 +18,7 @@
 #'
 #' @examples
 #' # Example using stream (ADaM) dataset
-#' data <- cdisc_data() |>
+#' data <- teal_data() |>
 #'   within({
 #'     ADSL <- rADSL
 #'     ADAE <- rADAE
diff --git a/R/tm_g_butterfly.R b/R/tm_g_butterfly.R
index 51c84702..8e6e965c 100644
--- a/R/tm_g_butterfly.R
+++ b/R/tm_g_butterfly.R
@@ -41,7 +41,7 @@
 #'
 #' @examplesIf require("nestcolor")
 #' # Example using stream (ADaM) dataset
-#' data <- cdisc_data() |>
+#' data <- teal_data() |>
 #'   within({
 #'     library(dplyr)
 #'     library(nestcolor)
diff --git a/R/tm_g_events_term_id.R b/R/tm_g_events_term_id.R
index 438a1c41..aac7751f 100644
--- a/R/tm_g_events_term_id.R
+++ b/R/tm_g_events_term_id.R
@@ -18,7 +18,7 @@
 #' @author Molly He (hey59) \email{hey59@gene.com}
 #'
 #' @examplesIf require("nestcolor")
-#' data <- cdisc_data() |>
+#' data <- teal_data() |>
 #'   within({
 #'     library(nestcolor)
 #'     ADSL <- rADSL
diff --git a/R/tm_g_heat_bygrade.R b/R/tm_g_heat_bygrade.R
index 059386c5..01cc6052 100644
--- a/R/tm_g_heat_bygrade.R
+++ b/R/tm_g_heat_bygrade.R
@@ -34,7 +34,7 @@
 #' @export
 #'
 #' @examplesIf require("nestcolor")
-#' data <- cdisc_data() |>
+#' data <- teal_data() |>
 #'   within({
 #'     library(dplyr)
 #'     library(nestcolor)
diff --git a/R/tm_g_patient_profile.R b/R/tm_g_patient_profile.R
index c60b5680..dc64b393 100644
--- a/R/tm_g_patient_profile.R
+++ b/R/tm_g_patient_profile.R
@@ -60,7 +60,7 @@
 #' @export
 #'
 #' @examplesIf require("nestcolor")
-#' data <- cdisc_data() |>
+#' data <- teal_data() |>
 #'   within({
 #'     library(nestcolor)
 #'     ADSL <- rADSL
diff --git a/R/tm_g_spiderplot.R b/R/tm_g_spiderplot.R
index 37722740..8e9238a1 100644
--- a/R/tm_g_spiderplot.R
+++ b/R/tm_g_spiderplot.R
@@ -26,7 +26,7 @@
 #'
 #' @examplesIf require("nestcolor")
 #' # Example using stream (ADaM) dataset
-#' data <- cdisc_data() |>
+#' data <- teal_data() |>
 #'   within({
 #'     library(nestcolor)
 #'     ADSL <- rADSL
diff --git a/R/tm_g_swimlane.R b/R/tm_g_swimlane.R
index 29bc9808..ff81e2e9 100644
--- a/R/tm_g_swimlane.R
+++ b/R/tm_g_swimlane.R
@@ -36,7 +36,7 @@
 #'
 #' @examplesIf require("nestcolor")
 #' # Example using stream (ADaM) dataset
-#' data <- cdisc_data() |>
+#' data <- teal_data() |>
 #'   within(library(dplyr)) |>
 #'   within(library(nestcolor)) |>
 #'   within(ADSL <- rADSL %>%
diff --git a/R/tm_g_waterfall.R b/R/tm_g_waterfall.R
index 6d04e3c7..04b9a2eb 100644
--- a/R/tm_g_waterfall.R
+++ b/R/tm_g_waterfall.R
@@ -47,7 +47,7 @@
 #' @author houx14 \email{houx14@gene.com}
 #'
 #' @examplesIf require("nestcolor")
-#' data <- cdisc_data() |>
+#' data <- teal_data() |>
 #'   within({
 #'     library(nestcolor)
 #'     ADSL <- rADSL
diff --git a/man/tm_g_ae_oview.Rd b/man/tm_g_ae_oview.Rd
index 1e4b4f50..310d39f5 100644
--- a/man/tm_g_ae_oview.Rd
+++ b/man/tm_g_ae_oview.Rd
@@ -52,7 +52,7 @@ Display the \code{AE} overview plot as a shiny module
 }
 \examples{
 \dontshow{if (require("nestcolor")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf}
-data <- cdisc_data() |>
+data <- teal_data() |>
   within({
     library(nestcolor)
     ADSL <- rADSL
diff --git a/man/tm_g_ae_sub.Rd b/man/tm_g_ae_sub.Rd
index 925ef6d0..06b4cc4c 100644
--- a/man/tm_g_ae_sub.Rd
+++ b/man/tm_g_ae_sub.Rd
@@ -50,7 +50,7 @@ Display the \code{AE} by subgroups plot as a teal module
 }
 \examples{
 # Example using stream (ADaM) dataset
-data <- cdisc_data() |>
+data <- teal_data() |>
   within({
     ADSL <- rADSL
     ADAE <- rADAE
diff --git a/man/tm_g_butterfly.Rd b/man/tm_g_butterfly.Rd
index 36a995f4..1daeeaae 100644
--- a/man/tm_g_butterfly.Rd
+++ b/man/tm_g_butterfly.Rd
@@ -88,7 +88,7 @@ used directly as filter.
 \examples{
 \dontshow{if (require("nestcolor")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf}
 # Example using stream (ADaM) dataset
-data <- cdisc_data() |>
+data <- teal_data() |>
   within({
     library(dplyr)
     library(nestcolor)
diff --git a/man/tm_g_events_term_id.Rd b/man/tm_g_events_term_id.Rd
index aa1b5939..fb8141ce 100644
--- a/man/tm_g_events_term_id.Rd
+++ b/man/tm_g_events_term_id.Rd
@@ -51,7 +51,7 @@ Display Events by Term plot as a shiny module
 }
 \examples{
 \dontshow{if (require("nestcolor")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf}
-data <- cdisc_data() |>
+data <- teal_data() |>
   within({
     library(nestcolor)
     ADSL <- rADSL
diff --git a/man/tm_g_heat_bygrade.Rd b/man/tm_g_heat_bygrade.Rd
index cb9b3500..5aeb1537 100644
--- a/man/tm_g_heat_bygrade.Rd
+++ b/man/tm_g_heat_bygrade.Rd
@@ -77,7 +77,7 @@ Display the heatmap by grade as a shiny module
 }
 \examples{
 \dontshow{if (require("nestcolor")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf}
-data <- cdisc_data() |>
+data <- teal_data() |>
   within({
     library(dplyr)
     library(nestcolor)
diff --git a/man/tm_g_patient_profile.Rd b/man/tm_g_patient_profile.Rd
index 26c18bd7..b86e870a 100644
--- a/man/tm_g_patient_profile.Rd
+++ b/man/tm_g_patient_profile.Rd
@@ -109,7 +109,7 @@ the start date
 }
 \examples{
 \dontshow{if (require("nestcolor")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf}
-data <- cdisc_data() |>
+data <- teal_data() |>
   within({
     library(nestcolor)
     ADSL <- rADSL
diff --git a/man/tm_g_spiderplot.Rd b/man/tm_g_spiderplot.Rd
index 53e9ba9e..fa780522 100644
--- a/man/tm_g_spiderplot.Rd
+++ b/man/tm_g_spiderplot.Rd
@@ -79,7 +79,7 @@ Display spider plot as a shiny module
 \examples{
 \dontshow{if (require("nestcolor")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf}
 # Example using stream (ADaM) dataset
-data <- cdisc_data() |>
+data <- teal_data() |>
   within({
     library(nestcolor)
     ADSL <- rADSL
diff --git a/man/tm_g_swimlane.Rd b/man/tm_g_swimlane.Rd
index 019b7b54..367bb1b8 100644
--- a/man/tm_g_swimlane.Rd
+++ b/man/tm_g_swimlane.Rd
@@ -83,7 +83,7 @@ This is teal module that generates a \code{swimlane} plot (bar plot with markers
 \examples{
 \dontshow{if (require("nestcolor")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf}
 # Example using stream (ADaM) dataset
-data <- cdisc_data() |>
+data <- teal_data() |>
   within(library(dplyr)) |>
   within(library(nestcolor)) |>
   within(ADSL <- rADSL \%>\%
diff --git a/man/tm_g_waterfall.Rd b/man/tm_g_waterfall.Rd
index cdb00195..b7b5de12 100644
--- a/man/tm_g_waterfall.Rd
+++ b/man/tm_g_waterfall.Rd
@@ -101,7 +101,7 @@ This is teal module that generates a waterfall plot for \code{ADaM} data
 }
 \examples{
 \dontshow{if (require("nestcolor")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf}
-data <- cdisc_data() |>
+data <- teal_data() |>
   within({
     library(nestcolor)
     ADSL <- rADSL