diff --git a/DESCRIPTION b/DESCRIPTION
index 115c408a..4e51387c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -27,6 +27,7 @@ Depends:
     R (>= 3.1.0)
 Imports:
     checkmate (>= 2.0.0),
+    cli,
     data.table,
     lgr,
     methods,
@@ -44,6 +45,7 @@ Suggests:
     redux,
     testthat (>= 3.0.0),
     rush (>= 0.1.2)
+Remotes: mlr-org/mlr3misc
 Config/testthat/edition: 3
 Config/testthat/parallel: false
 Encoding: UTF-8
diff --git a/NAMESPACE b/NAMESPACE
index 918e7c9f..e1ef775d 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -100,6 +100,7 @@ export(transform_xdt_to_xss)
 export(trm)
 export(trms)
 import(checkmate)
+import(cli)
 import(data.table)
 import(mlr3misc)
 import(paradox)
diff --git a/R/Archive.R b/R/Archive.R
index e5adf1cc..ad0ee094 100644
--- a/R/Archive.R
+++ b/R/Archive.R
@@ -67,8 +67,9 @@ Archive = R6Class("Archive",
     #'
     #' @param ... (ignored).
     print = function() {
-      catf(format(self))
-      print(self$data[, setdiff(names(self$data), "x_domain"), with = FALSE], digits = 2)
+      msg_h = if (is.na(self$label)) "" else paste0(" - ", self$label)
+      cat_cli(cli_h1("{.cls {class(self)[1L]}}{msg_h}"))
+      print(as.data.table(self, unnest = "x_domain"), digits = 1)
     },
 
     #' @description
diff --git a/R/Objective.R b/R/Objective.R
index 076a2ff9..d722985d 100644
--- a/R/Objective.R
+++ b/R/Objective.R
@@ -94,14 +94,16 @@ Objective = R6Class("Objective",
     #' Print method.
     #' @return `character()`.
     print = function() {
-      catf(self$format())
-      catf("Domain:")
-      print(self$domain)
-      catf("Codomain:")
-      print(self$codomain)
+      cat_cli({
+        cli_h1("{.cls {class(self)[1L]}}")
+        cli_li("Domain:")
+      })
+      print(as.data.table(self$domain)[, c("id", "class", "lower", "upper", "nlevels"), with = FALSE])
+      cat_cli(cli_li("Codomain:"))
+      print(as.data.table(self$codomain)[, c("id", "class", "lower", "upper"), with = FALSE])
       if (length(self$constants$values) > 0) {
-        catf("Constants:")
-        print(self$constants)
+        cat_cli(cli_li("Constants:"))
+        print(as.data.table(self$constants)[, c("id", "class", "lower", "upper", "nlevels"), with = FALSE])
       }
     },
 
diff --git a/R/OptimInstance.R b/R/OptimInstance.R
index 689ce7a0..1a857ac8 100644
--- a/R/OptimInstance.R
+++ b/R/OptimInstance.R
@@ -78,22 +78,24 @@ OptimInstance = R6Class("OptimInstance",
     #'
     #' @param ... (ignored).
     print = function(...) {
+      is_optimized = if (is.null(private$.result)) "Not optimized" else "Optimized"
+      cat_cli({
+        cli_h1("{.cls {class(self)[1L]}}")
+        cli_li("State: {is_optimized}")
+        cli_li("Objective: {.cls {class(self$objective)[1]}}")
+        cli_li("Search Space:")
+      })
+      print(as.data.table(self$search_space)[, c("id", "class", "lower", "upper", "nlevels"), with = FALSE])
+      terminator = if (length(self$terminator$param_set$values)) paste0("(", as_short_string(self$terminator$param_set$values), ")") else ""
+      cat_cli(cli_li("Terminator: {.cls {class(self$terminator)[1]}} {terminator}"))
 
-      catf(format(self))
-      catf(str_indent("* State: ", if (is.null(private$.result)) "Not optimized" else "Optimized"))
-      catf(str_indent("* Objective:", format(self$objective)))
-      if (!self$search_space$length) {
-        catf("* Search Space: Empty")
-      } else {
-        catf("* Search Space:")
-        print(as.data.table(self$search_space)[, c("id", "class", "lower", "upper", "nlevels"), with = FALSE])
-      }
-      catf(str_indent("* Terminator:", format(self$terminator)))
       if (!is.null(private$.result)) {
-        catf("* Result:")
+        cat_cli(cli_li("Result:"))
         print(self$result[, c(self$archive$cols_x, self$archive$cols_y), with = FALSE])
-        catf("* Archive:")
-        print(as.data.table(self$archive)[, c(self$archive$cols_x, self$archive$cols_y), with = FALSE])
+        cat_cli(cli_li("Archive:"))
+        tab = as.data.table(self$archive)
+        x_domain_ids = names(tab)[grepl("x_domain_" , names(tab))]
+        print(tab[, c(self$archive$cols_y, self$archive$cols_x, x_domain_ids), with = FALSE], digits = 1)
       }
     },
 
diff --git a/R/OptimInstanceAsync.R b/R/OptimInstanceAsync.R
index 0d37565d..b49a4a99 100644
--- a/R/OptimInstanceAsync.R
+++ b/R/OptimInstanceAsync.R
@@ -74,7 +74,7 @@ OptimInstanceAsync = R6Class("OptimInstanceAsync",
     #' @param ... (ignored).
     print = function(...) {
       super$print()
-      catf(str_indent("* Workers:", self$rush$n_workers))
+      cat_cli(cli_li("Workers: {.val {self$rush$n_workers}}"))
     },
 
     #' @description
diff --git a/R/Optimizer.R b/R/Optimizer.R
index 6ae27eb6..c0deec8d 100644
--- a/R/Optimizer.R
+++ b/R/Optimizer.R
@@ -74,11 +74,17 @@ Optimizer = R6Class("Optimizer",
     #'
     #' @return (`character()`).
     print = function() {
-      catn(format(self), if (is.na(self$label)) "" else paste0(": ", self$label))
-      catn(str_indent("* Parameters:", as_short_string(self$param_set$values)))
-      catn(str_indent("* Parameter classes:", self$param_classes))
-      catn(str_indent("* Properties:", self$properties))
-      catn(str_indent("* Packages:", self$packages))
+      msg_h = if (is.na(self$label)) "" else paste0(" - ", self$label)
+      msg_params = cli_vec(lapply(self$param_classes, function(cls) format_inline('{.cls {cls}}')),
+                          style = list(last = ' and ', sep = ', '))
+
+      cat_cli({
+        cli_h1("{.cls {class(self)[1L]}}{msg_h}")
+        cli_li("Parameters: {.args {as_short_string(self$param_set$values)}}")
+        cli_li("Parameter classes: {msg_params}")
+        cli_li("Properties: {self$properties}")
+        cli_li("Packages: {.pkg {self$packages}}")
+      })
     },
 
     #' @description
diff --git a/R/Terminator.R b/R/Terminator.R
index ce2f063c..85e5ce27 100644
--- a/R/Terminator.R
+++ b/R/Terminator.R
@@ -74,8 +74,16 @@ Terminator = R6Class("Terminator",
     #'
     #' @param ... (ignored).
     print = function(...) {
-      catn(format(self), if (is.na(self$label)) "" else paste0(": ", self$label))
-      catn(str_indent("* Parameters:", as_short_string(self$param_set$values)))
+      msg_h = if (is.na(self$label)) "" else paste0(" - ", self$label)
+      terminators = map_chr(self$terminators, function(t) {class(t)[1L]})
+      msg_trms = cli_vec(lapply(terminators, function(trm) format_inline('{.cls {trm}}')),
+                         style = list(last = ' and ', sep = ', '))
+
+      cat_cli({
+        cli_h1("{.cls {class(self)[1L]}}{msg_h}")
+        cli_li("Parameters: {as_short_string(self$param_set$values)}")
+        cli_li("Terminators: {msg_trms}")
+      })
     },
 
     #' @description
diff --git a/R/TerminatorCombo.R b/R/TerminatorCombo.R
index 684b7876..f4cb4f5d 100644
--- a/R/TerminatorCombo.R
+++ b/R/TerminatorCombo.R
@@ -76,8 +76,11 @@ TerminatorCombo = R6Class("TerminatorCombo",
     #' @param ... (ignored).
     print = function(...) {
       super$print(...)
-      catf(str_indent("* Terminators:", paste(map_chr(self$terminators, format),
-        collapse = ",")))
+
+      terminators = map_chr(self$terminators, function(t) {class(t)[1L]})
+      msg_trms = cli_vec(lapply(terminators, function(trm) format_inline('{.cls {trm}}')),
+                         style = list(last = ' and ', sep = ', '))
+      cat_cli(cli_li("Terminators: {msg_trms}"))
     },
 
     #' @description
diff --git a/R/zzz.R b/R/zzz.R
index e3598975..285b7487 100644
--- a/R/zzz.R
+++ b/R/zzz.R
@@ -2,6 +2,7 @@
 #' @import checkmate
 #' @import paradox
 #' @import mlr3misc
+#' @import cli
 #' @importFrom R6 R6Class
 #' @importFrom utils capture.output head tail
 #' @importFrom methods formalArgs
diff --git a/tests/testthat/_snaps/ArchiveBatch.md b/tests/testthat/_snaps/ArchiveBatch.md
index 11dbdfcc..5e0c7497 100644
--- a/tests/testthat/_snaps/ArchiveBatch.md
+++ b/tests/testthat/_snaps/ArchiveBatch.md
@@ -3,6 +3,7 @@
     Code
       a
     Output
-      <ArchiveBatch>
+      
+      -- <ArchiveBatch> - Data Table Storage -----------------------------------------
       Null data.table (0 rows and 0 cols)
 
diff --git a/tests/testthat/_snaps/Objective.md b/tests/testthat/_snaps/Objective.md
index 48915577..224fad64 100644
--- a/tests/testthat/_snaps/Objective.md
+++ b/tests/testthat/_snaps/Objective.md
@@ -3,34 +3,32 @@
     Code
       obj
     Output
-      <ObjectiveTestEval:f>
-      Domain:
-      <ParamSet(2)>
-             id    class lower upper nlevels        default  value
-         <char>   <char> <num> <num>   <num>         <list> <list>
-      1:     x1 ParamDbl    -1     1     Inf <NoDefault[0]> [NULL]
-      2:     x2 ParamDbl    -1     1     Inf <NoDefault[0]> [NULL]
-      Codomain:
-      <Codomain(1)>
-             id    class lower upper nlevels        default  value
-         <char>   <char> <num> <num>   <num>         <list> <list>
-      1:      y ParamDbl  -Inf   Inf     Inf <NoDefault[0]> [NULL]
+      
+      -- <ObjectiveTestEval> ---------------------------------------------------------
+      * Domain:
+             id    class lower upper nlevels
+         <char>   <char> <num> <num>   <num>
+      1:     x1 ParamDbl    -1     1     Inf
+      2:     x2 ParamDbl    -1     1     Inf
+      * Codomain:
+             id    class lower upper
+         <char>   <char> <num> <num>
+      1:      y ParamDbl  -Inf   Inf
 
 ---
 
     Code
       obj
     Output
-      <ObjectiveTestEvalMany:f>
-      Domain:
-      <ParamSet(2)>
-             id    class lower upper nlevels        default  value
-         <char>   <char> <num> <num>   <num>         <list> <list>
-      1:     x1 ParamDbl    -1     1     Inf <NoDefault[0]> [NULL]
-      2:     x2 ParamDbl    -1     1     Inf <NoDefault[0]> [NULL]
-      Codomain:
-      <Codomain(1)>
-             id    class lower upper nlevels        default  value
-         <char>   <char> <num> <num>   <num>         <list> <list>
-      1:      y ParamDbl  -Inf   Inf     Inf <NoDefault[0]> [NULL]
+      
+      -- <ObjectiveTestEvalMany> -----------------------------------------------------
+      * Domain:
+             id    class lower upper nlevels
+         <char>   <char> <num> <num>   <num>
+      1:     x1 ParamDbl    -1     1     Inf
+      2:     x2 ParamDbl    -1     1     Inf
+      * Codomain:
+             id    class lower upper
+         <char>   <char> <num> <num>
+      1:      y ParamDbl  -Inf   Inf
 
diff --git a/tests/testthat/_snaps/OptimInstanceBatchMultiCrit.md b/tests/testthat/_snaps/OptimInstanceBatchMultiCrit.md
index 68f10622..96047003 100644
--- a/tests/testthat/_snaps/OptimInstanceBatchMultiCrit.md
+++ b/tests/testthat/_snaps/OptimInstanceBatchMultiCrit.md
@@ -3,13 +3,14 @@
     Code
       inst
     Output
-      <OptimInstanceBatchMultiCrit>
-      * State:  Not optimized
-      * Objective: <ObjectiveRFun:function>
+      
+      -- <OptimInstanceBatchMultiCrit> -----------------------------------------------
+      * State: Not optimized
+      * Objective: <ObjectiveRFun>
       * Search Space:
              id    class lower upper nlevels
          <char>   <char> <num> <num>   <num>
       1:     x1 ParamDbl    -1     1     Inf
       2:     x2 ParamDbl    -1     1     Inf
-      * Terminator: <TerminatorEvals>
+      * Terminator: <TerminatorEvals> (n_evals=20, k=0)
 
diff --git a/tests/testthat/_snaps/OptimInstanceBatchSingleCrit.md b/tests/testthat/_snaps/OptimInstanceBatchSingleCrit.md
index 386cacab..69ddfceb 100644
--- a/tests/testthat/_snaps/OptimInstanceBatchSingleCrit.md
+++ b/tests/testthat/_snaps/OptimInstanceBatchSingleCrit.md
@@ -3,13 +3,14 @@
     Code
       inst
     Output
-      <OptimInstanceBatchSingleCrit>
-      * State:  Not optimized
-      * Objective: <ObjectiveRFun:function>
+      
+      -- <OptimInstanceBatchSingleCrit> ----------------------------------------------
+      * State: Not optimized
+      * Objective: <ObjectiveRFun>
       * Search Space:
              id    class lower upper nlevels
          <char>   <char> <num> <num>   <num>
       1:     x1 ParamDbl    -1     1     Inf
       2:     x2 ParamDbl    -1     1     Inf
-      * Terminator: <TerminatorEvals>
+      * Terminator: <TerminatorEvals> (n_evals=20, k=0)
 
diff --git a/tests/testthat/_snaps/OptimizerCmaes.md b/tests/testthat/_snaps/OptimizerCmaes.md
index ee0aacb1..2102466c 100644
--- a/tests/testthat/_snaps/OptimizerCmaes.md
+++ b/tests/testthat/_snaps/OptimizerCmaes.md
@@ -3,9 +3,10 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchCmaes>: Covariance Matrix Adaptation Evolution Strategy
+      
+      -- <OptimizerBatchCmaes> - Covariance Matrix Adaptation Evolution Strategy -----
       * Parameters: start_values=random
-      * Parameter classes: ParamDbl
+      * Parameter classes: <ParamDbl>
       * Properties: single-crit
-      * Packages: bbotk, adagio
+      * Packages: bbotk and adagio
 
diff --git a/tests/testthat/_snaps/OptimizerDesignPoints.md b/tests/testthat/_snaps/OptimizerDesignPoints.md
index f8fc902a..4182a1d0 100644
--- a/tests/testthat/_snaps/OptimizerDesignPoints.md
+++ b/tests/testthat/_snaps/OptimizerDesignPoints.md
@@ -3,10 +3,12 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchDesignPoints>: Design Points
+      
+      -- <OptimizerBatchDesignPoints> - Design Points --------------------------------
       * Parameters: batch_size=1, design=<data.table>
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct, ParamUty
-      * Properties: dependencies, single-crit, multi-crit
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, <ParamFct>, and
+      <ParamUty>
+      * Properties: dependencies, single-crit, and multi-crit
       * Packages: bbotk
 
 ---
@@ -14,9 +16,11 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchDesignPoints>: Design Points
+      
+      -- <OptimizerBatchDesignPoints> - Design Points --------------------------------
       * Parameters: batch_size=1, design=<data.table>
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct, ParamUty
-      * Properties: dependencies, single-crit, multi-crit
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, <ParamFct>, and
+      <ParamUty>
+      * Properties: dependencies, single-crit, and multi-crit
       * Packages: bbotk
 
diff --git a/tests/testthat/_snaps/OptimizerFocusSearch.md b/tests/testthat/_snaps/OptimizerFocusSearch.md
index 4129de14..8455762a 100644
--- a/tests/testthat/_snaps/OptimizerFocusSearch.md
+++ b/tests/testthat/_snaps/OptimizerFocusSearch.md
@@ -3,10 +3,11 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchFocusSearch>: Focus Search
+      
+      -- <OptimizerBatchFocusSearch> - Focus Search ----------------------------------
       * Parameters: n_points=1, maxit=10
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies and single-crit
       * Packages: bbotk
 
 ---
@@ -14,9 +15,10 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchFocusSearch>: Focus Search
+      
+      -- <OptimizerBatchFocusSearch> - Focus Search ----------------------------------
       * Parameters: n_points=10, maxit=10
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies and single-crit
       * Packages: bbotk
 
diff --git a/tests/testthat/_snaps/OptimizerGenSA.md b/tests/testthat/_snaps/OptimizerGenSA.md
index 56f9d450..23d4da56 100644
--- a/tests/testthat/_snaps/OptimizerGenSA.md
+++ b/tests/testthat/_snaps/OptimizerGenSA.md
@@ -3,9 +3,10 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchGenSA>: Generalized Simulated Annealing
+      
+      -- <OptimizerBatchGenSA> - Generalized Simulated Annealing ---------------------
       * Parameters: list()
-      * Parameter classes: ParamDbl
+      * Parameter classes: <ParamDbl>
       * Properties: single-crit
-      * Packages: bbotk, GenSA
+      * Packages: bbotk and GenSA
 
diff --git a/tests/testthat/_snaps/OptimizerGridSearch.md b/tests/testthat/_snaps/OptimizerGridSearch.md
index 664cdc56..c01d2921 100644
--- a/tests/testthat/_snaps/OptimizerGridSearch.md
+++ b/tests/testthat/_snaps/OptimizerGridSearch.md
@@ -3,10 +3,11 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchGridSearch>: Grid Search
+      
+      -- <OptimizerBatchGridSearch> - Grid Search ------------------------------------
       * Parameters: batch_size=1, resolution=10
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit, multi-crit
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies, single-crit, and multi-crit
       * Packages: bbotk
 
 ---
@@ -14,9 +15,10 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchGridSearch>: Grid Search
+      
+      -- <OptimizerBatchGridSearch> - Grid Search ------------------------------------
       * Parameters: batch_size=1, resolution=10
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit, multi-crit
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies, single-crit, and multi-crit
       * Packages: bbotk
 
diff --git a/tests/testthat/_snaps/OptimizerLocalSearch.md b/tests/testthat/_snaps/OptimizerLocalSearch.md
index 34b8af83..c9bc271e 100644
--- a/tests/testthat/_snaps/OptimizerLocalSearch.md
+++ b/tests/testthat/_snaps/OptimizerLocalSearch.md
@@ -3,11 +3,12 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchLocalSearch>: Local Search
+      
+      -- <OptimizerBatchLocalSearch> - Local Search ----------------------------------
       * Parameters: n_initial_points=3, initial_random_sample_size=100,
-        neighbors_per_point=10, mutation_sd=0.1
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit
+      neighbors_per_point=10, mutation_sd=0.1
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies and single-crit
       * Packages: bbotk
 
 # OptimizerBatchLocalSearch mixed hierarchical search space
@@ -15,11 +16,12 @@
     Code
       optimizer
     Output
-      <OptimizerBatchLocalSearch>: Local Search
+      
+      -- <OptimizerBatchLocalSearch> - Local Search ----------------------------------
       * Parameters: n_initial_points=3, initial_random_sample_size=100,
-        neighbors_per_point=10, mutation_sd=0.1
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit
+      neighbors_per_point=10, mutation_sd=0.1
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies and single-crit
       * Packages: bbotk
 
 # OptimizerBatchLocalSearch trafo
@@ -27,10 +29,11 @@
     Code
       optimizer
     Output
-      <OptimizerBatchLocalSearch>: Local Search
+      
+      -- <OptimizerBatchLocalSearch> - Local Search ----------------------------------
       * Parameters: n_initial_points=3, initial_random_sample_size=100,
-        neighbors_per_point=10, mutation_sd=0.1
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit
+      neighbors_per_point=10, mutation_sd=0.1
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies and single-crit
       * Packages: bbotk
 
diff --git a/tests/testthat/_snaps/OptimizerNLoptr.md b/tests/testthat/_snaps/OptimizerNLoptr.md
index b49aa021..6dc85c90 100644
--- a/tests/testthat/_snaps/OptimizerNLoptr.md
+++ b/tests/testthat/_snaps/OptimizerNLoptr.md
@@ -3,10 +3,11 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchNLoptr>: Non-linear Optimization
-      * Parameters: algorithm=NLOPT_LN_BOBYQA, xtol_rel=-1, xtol_abs=-1,
-        ftol_rel=-1, ftol_abs=-1, start_values=random
-      * Parameter classes: ParamDbl
+      
+      -- <OptimizerBatchNLoptr> - Non-linear Optimization ----------------------------
+      * Parameters: algorithm=NLOPT_LN_BOBYQA, xtol_rel=-1, xtol_abs=-1, ftol_rel=-1,
+      ftol_abs=-1, start_values=random
+      * Parameter classes: <ParamDbl>
       * Properties: single-crit
-      * Packages: bbotk, nloptr
+      * Packages: bbotk and nloptr
 
diff --git a/tests/testthat/_snaps/OptimizerRandomSearch.md b/tests/testthat/_snaps/OptimizerRandomSearch.md
index 0bb24a28..839f3e71 100644
--- a/tests/testthat/_snaps/OptimizerRandomSearch.md
+++ b/tests/testthat/_snaps/OptimizerRandomSearch.md
@@ -3,10 +3,11 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchRandomSearch>: Random Search
+      
+      -- <OptimizerBatchRandomSearch> - Random Search --------------------------------
       * Parameters: batch_size=1
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit, multi-crit
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies, single-crit, and multi-crit
       * Packages: bbotk
 
 ---
@@ -14,10 +15,11 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchRandomSearch>: Random Search
+      
+      -- <OptimizerBatchRandomSearch> - Random Search --------------------------------
       * Parameters: batch_size=1
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit, multi-crit
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies, single-crit, and multi-crit
       * Packages: bbotk
 
 ---
@@ -25,9 +27,10 @@
     Code
       z$optimizer
     Output
-      <OptimizerBatchRandomSearch>: Random Search
+      
+      -- <OptimizerBatchRandomSearch> - Random Search --------------------------------
       * Parameters: batch_size=10
-      * Parameter classes: ParamLgl, ParamInt, ParamDbl, ParamFct
-      * Properties: dependencies, single-crit, multi-crit
+      * Parameter classes: <ParamLgl>, <ParamInt>, <ParamDbl>, and <ParamFct>
+      * Properties: dependencies, single-crit, and multi-crit
       * Packages: bbotk
 
diff --git a/tests/testthat/_snaps/TerminatorClockTime.md b/tests/testthat/_snaps/TerminatorClockTime.md
index 7a876845..6647436e 100644
--- a/tests/testthat/_snaps/TerminatorClockTime.md
+++ b/tests/testthat/_snaps/TerminatorClockTime.md
@@ -3,6 +3,8 @@
     Code
       terminator
     Output
-      <TerminatorClockTime>: Clock Time
+      
+      -- <TerminatorClockTime> - Clock Time ------------------------------------------
       * Parameters: stop_time=<POSIXct>
+      * Terminators:
 
diff --git a/tests/testthat/_snaps/TerminatorCombo.md b/tests/testthat/_snaps/TerminatorCombo.md
index 449f1a5d..ab86c41f 100644
--- a/tests/testthat/_snaps/TerminatorCombo.md
+++ b/tests/testthat/_snaps/TerminatorCombo.md
@@ -3,7 +3,9 @@
     Code
       terminator
     Output
-      <TerminatorCombo>: Combination
+      
+      -- <TerminatorCombo> - Combination ---------------------------------------------
       * Parameters: any=TRUE
-      * Terminators: <TerminatorEvals>,<TerminatorEvals>
+      * Terminators: <TerminatorEvals> and <TerminatorEvals>
+      * Terminators: <TerminatorEvals> and <TerminatorEvals>
 
diff --git a/tests/testthat/_snaps/TerminatorEvals.md b/tests/testthat/_snaps/TerminatorEvals.md
index 89c17446..89722774 100644
--- a/tests/testthat/_snaps/TerminatorEvals.md
+++ b/tests/testthat/_snaps/TerminatorEvals.md
@@ -3,22 +3,28 @@
     Code
       inst$terminator
     Output
-      <TerminatorEvals>: Number of Evaluation
+      
+      -- <TerminatorEvals> - Number of Evaluation ------------------------------------
       * Parameters: n_evals=7, k=0
+      * Terminators:
 
 ---
 
     Code
       inst$terminator
     Output
-      <TerminatorEvals>: Number of Evaluation
+      
+      -- <TerminatorEvals> - Number of Evaluation ------------------------------------
       * Parameters: n_evals=7, k=2
+      * Terminators:
 
 ---
 
     Code
       inst$terminator
     Output
-      <TerminatorEvals>: Number of Evaluation
+      
+      -- <TerminatorEvals> - Number of Evaluation ------------------------------------
       * Parameters: n_evals=0, k=2
+      * Terminators:
 
diff --git a/tests/testthat/_snaps/TerminatorNone.md b/tests/testthat/_snaps/TerminatorNone.md
index da57bfa7..b8d7a5bc 100644
--- a/tests/testthat/_snaps/TerminatorNone.md
+++ b/tests/testthat/_snaps/TerminatorNone.md
@@ -4,11 +4,15 @@
       terminators
     Output
       $evals
-      <TerminatorEvals>: Number of Evaluation
+      
+      -- <TerminatorEvals> - Number of Evaluation ------------------------------------
       * Parameters: n_evals=10, k=0
+      * Terminators:
       
       $none
-      <TerminatorNone>: None
+      
+      -- <TerminatorNone> - None -----------------------------------------------------
       * Parameters: list()
+      * Terminators:
       
 
diff --git a/tests/testthat/_snaps/TerminatorPerfReached.md b/tests/testthat/_snaps/TerminatorPerfReached.md
index e6280a3e..efb3de6c 100644
--- a/tests/testthat/_snaps/TerminatorPerfReached.md
+++ b/tests/testthat/_snaps/TerminatorPerfReached.md
@@ -3,6 +3,8 @@
     Code
       terminator
     Output
-      <TerminatorPerfReached>: Performance Level
+      
+      -- <TerminatorPerfReached> - Performance Level ---------------------------------
       * Parameters: level=0.2
+      * Terminators:
 
diff --git a/tests/testthat/_snaps/TerminatorRunTime.md b/tests/testthat/_snaps/TerminatorRunTime.md
index bf918c02..4f617aa5 100644
--- a/tests/testthat/_snaps/TerminatorRunTime.md
+++ b/tests/testthat/_snaps/TerminatorRunTime.md
@@ -3,6 +3,8 @@
     Code
       terminator
     Output
-      <TerminatorRunTime>: Run Time
+      
+      -- <TerminatorRunTime> - Run Time ----------------------------------------------
       * Parameters: secs=1
+      * Terminators:
 
diff --git a/tests/testthat/_snaps/TerminatorStagnation.md b/tests/testthat/_snaps/TerminatorStagnation.md
index b54af3e1..e90196f6 100644
--- a/tests/testthat/_snaps/TerminatorStagnation.md
+++ b/tests/testthat/_snaps/TerminatorStagnation.md
@@ -3,6 +3,8 @@
     Code
       terminator
     Output
-      <TerminatorStagnation>: Stagnation
+      
+      -- <TerminatorStagnation> - Stagnation -----------------------------------------
       * Parameters: iters=10, threshold=100
+      * Terminators:
 
diff --git a/tests/testthat/_snaps/TerminatorStagnationBatch.md b/tests/testthat/_snaps/TerminatorStagnationBatch.md
index 596fa32b..802ce943 100644
--- a/tests/testthat/_snaps/TerminatorStagnationBatch.md
+++ b/tests/testthat/_snaps/TerminatorStagnationBatch.md
@@ -3,14 +3,18 @@
     Code
       terminator
     Output
-      <TerminatorStagnationBatch>: Stagnation Batch
+      
+      -- <TerminatorStagnationBatch> - Stagnation Batch ------------------------------
       * Parameters: n=1, threshold=0
+      * Terminators:
 
 # TerminatorStagnationBatch works with single objective and n = 2
 
     Code
       terminator
     Output
-      <TerminatorStagnationBatch>: Stagnation Batch
+      
+      -- <TerminatorStagnationBatch> - Stagnation Batch ------------------------------
       * Parameters: n=2, threshold=0
+      * Terminators: