diff --git a/extensions/cloud_optics/mo_cloud_optics.F90 b/extensions/cloud_optics/mo_cloud_optics.F90
index 903b8f40b..1d7369154 100644
--- a/extensions/cloud_optics/mo_cloud_optics.F90
+++ b/extensions/cloud_optics/mo_cloud_optics.F90
@@ -19,6 +19,11 @@
 ! -------------------------------------------------------------------------------------------------
 
 module mo_cloud_optics
+
+!! \section arg_table_mo_cloud_optics
+!! \htmlinclude mo_cloud_optics.html
+!!
+
   use mo_rte_kind,      only: wp, wl
   use mo_rte_config,    only: check_values, check_extents
   use mo_rte_util_array,only: any_vals_less_than, any_vals_outside, extents_are
@@ -33,11 +38,10 @@ module mo_cloud_optics
   end interface pade_eval
   private
   ! -----------------------------------------------------------------------------------
-#if 0
-!! \section arg_table_mo_cloud_optics
-!! \htmlinclude mo_cloud_optics.html
+
+!! \section arg_table_ty_cloud_optics Argument Table
+!! \htmlinclude ty_cloud_optics.html
 !!
-#endif
   type, extends(ty_optical_props), public :: ty_cloud_optics
     private
     !
diff --git a/extensions/cloud_optics/mo_cloud_optics.meta b/extensions/cloud_optics/mo_cloud_optics.meta
index d109218f6..93cc55103 100644
--- a/extensions/cloud_optics/mo_cloud_optics.meta
+++ b/extensions/cloud_optics/mo_cloud_optics.meta
@@ -1,3 +1,14 @@
+[ccpp-table-properties]
+  name = ty_cloud_optics
+  type = ddt
+  dependencies =
+
+[ccpp-arg-table]
+  name = ty_cloud_optics
+  type = ddt
+
+########################################################################
+
 [ccpp-table-properties]
   name = mo_cloud_optics
   type = module
diff --git a/rrtmgp/mo_gas_concentrations.F90 b/rrtmgp/mo_gas_concentrations.F90
index fbe346b2c..8bc558162 100644
--- a/rrtmgp/mo_gas_concentrations.F90
+++ b/rrtmgp/mo_gas_concentrations.F90
@@ -30,6 +30,11 @@
 ! -------------------------------------------------------------------------------------------------
 
 module mo_gas_concentrations
+
+!! \section arg_table_mo_gas_concentrations Argument Table
+!! \htmlinclude mo_gas_concentrations.html
+!!
+
   use mo_rte_kind,           only: wp
   use mo_rte_config,         only: check_values
   use mo_rrtmgp_util_string, only: lower_case
@@ -41,8 +46,8 @@ module mo_gas_concentrations
     real(wp), dimension(:,:), pointer :: conc => NULL()
   end type conc_field
 
-!! \section arg_table_mo_gas_concentrations
-!! \htmlinclude mo_gas_concentrations.html
+!! \section arg_table_ty_gas_concs Argument Table
+!! \htmlinclude ty_gas_concs.html
 !!
   type, public :: ty_gas_concs
     !
diff --git a/rrtmgp/mo_gas_concentrations.meta b/rrtmgp/mo_gas_concentrations.meta
index ae79d07c1..a01f71447 100644
--- a/rrtmgp/mo_gas_concentrations.meta
+++ b/rrtmgp/mo_gas_concentrations.meta
@@ -1,3 +1,14 @@
+[ccpp-table-properties]
+  name = ty_gas_concs
+  type = ddt
+  dependencies =
+
+[ccpp-arg-table]
+  name = ty_gas_concs
+  type = ddt
+
+########################################################################
+
 [ccpp-table-properties]
   name = mo_gas_concentrations
   type = module
diff --git a/rrtmgp/mo_gas_optics_rrtmgp.F90 b/rrtmgp/mo_gas_optics_rrtmgp.F90
index 720f57e55..b80b7a406 100644
--- a/rrtmgp/mo_gas_optics_rrtmgp.F90
+++ b/rrtmgp/mo_gas_optics_rrtmgp.F90
@@ -21,6 +21,10 @@
 !
 ! -------------------------------------------------------------------------------------------------
 module mo_gas_optics_rrtmgp
+
+!! \section arg_table_mo_gas_optics_rrtmgp Argument Table
+!! \htmlinclude mo_gas_optics.html
+!!
   use mo_rte_kind,           only: wp, wl
   use mo_rte_config,         only: check_extents, check_values
   use mo_rte_util_array,     only: zero_array, any_vals_less_than, any_vals_outside, extents_are
@@ -39,11 +43,9 @@ module mo_gas_optics_rrtmgp
   private
   real(wp), parameter :: pi = acos(-1._wp)
 
-#if 0
-!! \section arg_table_mo_gas_optics_rrtmgp
-!! \htmlinclude mo_gas_optics.html
+!! \section arg_table_ty_gas_optics_rrtmgp Argument Table
+!! \htmlinclude ty_gas_optics_rrtmgp.html
 !!
-#endif
   type, extends(ty_gas_optics), public :: ty_gas_optics_rrtmgp
     private
     !
diff --git a/rrtmgp/mo_gas_optics_rrtmgp.meta b/rrtmgp/mo_gas_optics_rrtmgp.meta
index 1605649f3..6260dfcbf 100644
--- a/rrtmgp/mo_gas_optics_rrtmgp.meta
+++ b/rrtmgp/mo_gas_optics_rrtmgp.meta
@@ -1,3 +1,14 @@
+[ccpp-table-properties]
+  name = ty_gas_optics_rrtmgp
+  type = ddt
+  dependencies =
+
+[ccpp-arg-table]
+  name = ty_gas_optics_rrtmgp
+  type = ddt
+
+########################################################################
+
 [ccpp-table-properties]
   name = mo_gas_optics_rrtmgp
   type = module
@@ -7,9 +18,10 @@
 [ccpp-arg-table]
   name = mo_gas_optics_rrtmgp
   type = module
+
 [ty_gas_optics_rrtmgp]
   standard_name = ty_gas_optics_rrtmgp
   long_name = definition of type ty_gas_optics_rrtmgp
-  units = DDT
+  units = ddt
   dimensions = ()
   type = ty_gas_optics_rrtmgp
diff --git a/rte/mo_optical_props.F90 b/rte/mo_optical_props.F90
index 8eabad438..eb2411c2a 100644
--- a/rte/mo_optical_props.F90
+++ b/rte/mo_optical_props.F90
@@ -39,6 +39,11 @@
 !
 ! -------------------------------------------------------------------------------------------------
 module mo_optical_props
+
+!! \section arg_table_mo_optical_props Argument Table
+!! \htmlinclude mo_optical_props.html
+!!
+
   use mo_rte_kind,              only: wp
   use mo_rte_util_array,        only: any_vals_less_than, any_vals_outside, extents_are
   use mo_optical_props_kernels, only: &
@@ -158,13 +163,12 @@ end function subset_range_abstract
   !     phase function moments (index 1 = g) for use with discrete ordinate methods
   !
   ! -------------------------------------------------------------------------------------------------
-
-!! \section arg_table_mo_optical_props Argument Table
-!! \htmlinclude mo_optical_props.html
-!!
 
+!! \section arg_table_ty_optical_props_1scl Argument Table
+!! \htmlinclude ty_optical_props_1scl.html
+!!
   type, public, extends(ty_optical_props_arry) :: ty_optical_props_1scl
-
+
   contains
     procedure, public  :: validate => validate_1scalar
     procedure, public  :: get_subset => subset_1scl_range
@@ -178,6 +182,9 @@ end function subset_range_abstract
   end type
 
   ! --- 2 stream ------------------------------------------------------------------------
+!! \section arg_table_ty_optical_props_2str Argument Table
+!! \htmlinclude ty_optical_props_2str.html
+!!
   type, public, extends(ty_optical_props_arry) :: ty_optical_props_2str
     real(wp), dimension(:,:,:), allocatable :: ssa ! single-scattering albedo (ncol, nlay, ngpt)
     real(wp), dimension(:,:,:), allocatable :: g   ! asymmetry parameter (ncol, nlay, ngpt)
@@ -194,6 +201,9 @@ end function subset_range_abstract
   end type
 
   ! --- n stream ------------------------------------------------------------------------
+!! \section arg_table_ty_optical_props_nstr Argument Table
+!! \htmlinclude ty_optical_props_nstr.html
+!!
   type, public, extends(ty_optical_props_arry) :: ty_optical_props_nstr
     real(wp), dimension(:,:,:),   allocatable :: ssa ! single-scattering albedo (ncol, nlay, ngpt)
     real(wp), dimension(:,:,:,:), allocatable :: p   ! phase-function moments (nmom, ncol, nlay, ngpt)
diff --git a/rte/mo_optical_props.meta b/rte/mo_optical_props.meta
index 5c5d58d23..60e6562b8 100644
--- a/rte/mo_optical_props.meta
+++ b/rte/mo_optical_props.meta
@@ -1,3 +1,36 @@
+[ccpp-table-properties]
+  name = ty_optical_props_1scl
+  type = ddt
+  dependencies = 
+
+[ccpp-arg-table]
+  name = ty_optical_props_1scl
+  type = ddt
+
+########################################################################
+
+[ccpp-table-properties]
+  name = ty_optical_props_2str
+  type = ddt
+  dependencies = 
+
+[ccpp-arg-table]
+  name = ty_optical_props_2str
+  type = ddt
+
+########################################################################
+
+[ccpp-table-properties]
+  name = ty_optical_props_nstr
+  type = ddt
+  dependencies = 
+
+[ccpp-arg-table]
+  name = ty_optical_props_nstr
+  type = ddt
+
+########################################################################
+
 [ccpp-table-properties]
   name = mo_optical_props
   type = module
diff --git a/rte/mo_source_functions.F90 b/rte/mo_source_functions.F90
index cbd5862f2..a8d86446e 100644
--- a/rte/mo_source_functions.F90
+++ b/rte/mo_source_functions.F90
@@ -15,12 +15,17 @@
 !
 ! -------------------------------------------------------------------------------------------------
 module mo_source_functions
+
+!! \section arg_table_mo_source_functions Argument Table
+!! \htmlinclude mo_source_functions.html
+!!
+
   use mo_rte_kind,      only: wp
   use mo_optical_props, only: ty_optical_props
   implicit none
 
-!! \section arg_table_mo_source_functions Argument Table
-!! \htmlinclude mo_source_functions.html
+!! \section arg_table_ty_source_func_lw Argument Table
+!! \htmlinclude ty_source_func_lw.html
 !!
   ! -------------------------------------------------------------------------------------------------
   !
diff --git a/rte/mo_source_functions.meta b/rte/mo_source_functions.meta
index c256a8355..9ed2e251f 100644
--- a/rte/mo_source_functions.meta
+++ b/rte/mo_source_functions.meta
@@ -1,3 +1,14 @@
+[ccpp-table-properties]
+  name = ty_source_func_lw
+  type = ddt
+  dependencies =
+
+[ccpp-arg-table]
+  name = ty_source_func_lw
+  type = ddt
+
+########################################################################
+
 [ccpp-table-properties]
   name = mo_source_functions
   type = module