diff --git a/NAMESPACE b/NAMESPACE
index 590c4b2f..44baa2a4 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,29 +1,40 @@
 # Generated by roxygen2: do not edit by hand
 
-export(label_log)
-export(length_log)
-export(type_log)
-export(var_names_log)
-export(var_ord_msg)
+export(xportr)
 export(xportr_df_label)
 export(xportr_format)
 export(xportr_label)
 export(xportr_length)
-export(xportr_logger)
 export(xportr_metadata)
+export(xportr_options)
 export(xportr_order)
 export(xportr_type)
 export(xportr_write)
 export(xpt_validate)
 import(haven)
 import(rlang)
+importFrom(checkmate,assert)
+importFrom(checkmate,assert_character)
+importFrom(checkmate,assert_choice)
+importFrom(checkmate,assert_data_frame)
+importFrom(checkmate,assert_integer)
+importFrom(checkmate,assert_logical)
+importFrom(checkmate,assert_string)
+importFrom(checkmate,check_data_frame)
+importFrom(checkmate,check_r6)
+importFrom(checkmate,makeAssertion)
+importFrom(checkmate,test_data_frame)
+importFrom(checkmate,test_string)
+importFrom(checkmate,vname)
 importFrom(cli,cli_alert_danger)
 importFrom(cli,cli_alert_info)
 importFrom(cli,cli_alert_success)
 importFrom(cli,cli_div)
 importFrom(cli,cli_h2)
 importFrom(cli,cli_text)
+importFrom(dplyr,across)
 importFrom(dplyr,arrange)
+importFrom(dplyr,as_tibble)
 importFrom(dplyr,bind_cols)
 importFrom(dplyr,case_when)
 importFrom(dplyr,distinct)
@@ -46,6 +57,7 @@ importFrom(graphics,stem)
 importFrom(lifecycle,deprecated)
 importFrom(magrittr,"%>%")
 importFrom(magrittr,extract2)
+importFrom(purrr,iwalk)
 importFrom(purrr,map)
 importFrom(purrr,map2_chr)
 importFrom(purrr,map_chr)
@@ -60,6 +72,7 @@ importFrom(stringr,str_replace)
 importFrom(stringr,str_replace_all)
 importFrom(tidyselect,all_of)
 importFrom(tidyselect,any_of)
+importFrom(tidyselect,where)
 importFrom(utils,capture.output)
 importFrom(utils,packageVersion)
 importFrom(utils,str)
diff --git a/man/metadata.Rd b/man/metadata.Rd
index 9df1c6c8..30918a0c 100644
--- a/man/metadata.Rd
+++ b/man/metadata.Rd
@@ -12,7 +12,7 @@ xportr_metadata(.df, metadata = NULL, domain = NULL, verbose = NULL)
 \item{metadata}{A data frame containing variable level metadata. See
 'Metadata' section for details.}
 
-\item{domain}{Appropriate CDISC dataset name, e.g. ADAE, DM. Used to subset
+\item{domain}{Appropriate CDSIC dataset name, e.g. ADAE, DM. Used to subset
 the metadata object. If none is passed, then name of the dataset passed as
 .df will be used.}
 
diff --git a/man/xportr-package.Rd b/man/xportr-package.Rd
index 2f38a255..bcd0521d 100644
--- a/man/xportr-package.Rd
+++ b/man/xportr-package.Rd
@@ -85,7 +85,8 @@ coerce R classes to numeric XPT types. Default: c("integer", "numeric", "num", "
 }
 \item{
 xportr.numeric_types - The default character vector used to explicitly
-coerce R classes to numeric XPT types. Default: c("integer", "float", "numeric", "posixct", "posixt", "time", "date")
+coerce R classes to numeric XPT types. Default: c("integer", "float",
+"numeric", "posixct", "posixt", "time", "date")
 }
 }
 }
diff --git a/man/xportr_df_label.Rd b/man/xportr_df_label.Rd
index 5f95d771..691de990 100644
--- a/man/xportr_df_label.Rd
+++ b/man/xportr_df_label.Rd
@@ -12,7 +12,7 @@ xportr_df_label(.df, metadata = NULL, domain = NULL, metacore = deprecated())
 \item{metadata}{A data frame containing dataset. See 'Metadata' section for
 details.}
 
-\item{domain}{Appropriate CDISC dataset name, e.g. ADAE, DM. Used to subset
+\item{domain}{Appropriate CDSIC dataset name, e.g. ADAE, DM. Used to subset
 the metadata object. If none is passed, then name of the dataset passed as
 .df will be used.}
 
diff --git a/man/xportr_format.Rd b/man/xportr_format.Rd
index 0c00da1b..e085a345 100644
--- a/man/xportr_format.Rd
+++ b/man/xportr_format.Rd
@@ -12,7 +12,7 @@ xportr_format(.df, metadata = NULL, domain = NULL, metacore = deprecated())
 \item{metadata}{A data frame containing variable level metadata. See
 'Metadata' section for details.}
 
-\item{domain}{Appropriate CDISC dataset name, e.g. ADAE, DM. Used to subset
+\item{domain}{Appropriate CDSIC dataset name, e.g. ADAE, DM. Used to subset
 the metadata object. If none is passed, then name of the dataset passed as
 .df will be used.}
 
diff --git a/man/xportr_label.Rd b/man/xportr_label.Rd
index a61e0583..eb03df81 100644
--- a/man/xportr_label.Rd
+++ b/man/xportr_label.Rd
@@ -18,7 +18,7 @@ xportr_label(
 \item{metadata}{A data frame containing variable level metadata. See
 'Metadata' section for details.}
 
-\item{domain}{Appropriate CDISC dataset name, e.g. ADAE, DM. Used to subset
+\item{domain}{Appropriate CDSIC dataset name, e.g. ADAE, DM. Used to subset
 the metadata object. If none is passed, then name of the dataset passed as
 .df will be used.}
 
diff --git a/man/xportr_length.Rd b/man/xportr_length.Rd
index 93425808..8d034eb8 100644
--- a/man/xportr_length.Rd
+++ b/man/xportr_length.Rd
@@ -19,7 +19,7 @@ xportr_length(
 \item{metadata}{A data frame containing variable level metadata. See
 'Metadata' section for details.}
 
-\item{domain}{Appropriate CDISC dataset name, e.g. ADAE, DM. Used to subset
+\item{domain}{Appropriate CDSIC dataset name, e.g. ADAE, DM. Used to subset
 the metadata object. If none is passed, then name of the dataset passed as
 .df will be used.}
 
diff --git a/man/xportr_order.Rd b/man/xportr_order.Rd
index 03617d4f..26b87f42 100644
--- a/man/xportr_order.Rd
+++ b/man/xportr_order.Rd
@@ -18,7 +18,7 @@ xportr_order(
 \item{metadata}{A data frame containing variable level metadata. See
 'Metadata' section for details.}
 
-\item{domain}{Appropriate CDISC dataset name, e.g. ADAE, DM. Used to subset
+\item{domain}{Appropriate CDSIC dataset name, e.g. ADAE, DM. Used to subset
 the metadata object. If none is passed, then name of the dataset passed as
 .df will be used.}
 
diff --git a/man/xportr_type.Rd b/man/xportr_type.Rd
index 05489fcf..736fe0c6 100644
--- a/man/xportr_type.Rd
+++ b/man/xportr_type.Rd
@@ -18,7 +18,7 @@ xportr_type(
 \item{metadata}{A data frame containing variable level metadata. See
 'Metadata' section for details.}
 
-\item{domain}{Appropriate CDISC dataset name, e.g. ADAE, DM. Used to subset
+\item{domain}{Appropriate CDSIC dataset name, e.g. ADAE, DM. Used to subset
 the metadata object. If none is passed, then name of the dataset passed as
 .df will be used.}
 
diff --git a/man/xportr_write.Rd b/man/xportr_write.Rd
index bde66844..c6bd4a1d 100644
--- a/man/xportr_write.Rd
+++ b/man/xportr_write.Rd
@@ -22,7 +22,7 @@ used as \code{xpt} name.}
 \item{metadata}{A data frame containing dataset. See 'Metadata' section for
 details.}
 
-\item{domain}{Appropriate CDISC dataset name, e.g. ADAE, DM. Used to subset
+\item{domain}{Appropriate CDSIC dataset name, e.g. ADAE, DM. Used to subset
 the metadata object. If none is passed, then name of the dataset passed as
 .df will be used.}