diff --git a/Artifacts.toml b/Artifacts.toml
index d819275697..00945b337d 100644
--- a/Artifacts.toml
+++ b/Artifacts.toml
@@ -1,16 +1,19 @@
+[ameriflux_data_US-MOz]
+git-tree-sha1 = "37177736bb2a1d14416961561911e06c24942c4a"
+
 [era5_land_forcing_data2021]
 git-tree-sha1 = "ec424296df6b60cfe273ac8f981701fbbed0bd8a"
 
-[soil_params_Gupta2020_2022]
-git-tree-sha1 = "c10e8f877603bfa2c018eb2dd0c51dd078abe5df"
-
-    [[soil_params_Gupta2020_2022.download]]
-    sha256 = "6205d96ae7724c469eef5cd1cf3b99e186637427b6fb65ecc659fb808fc6cacf"
-    url = "https://caltech.box.com/shared/static/7c6yx62tzjivxfmhqyy03r6e9l1glyu1.gz"
-
 [snowmip]
 git-tree-sha1 = "230f00823299e7e33d276d9b57cba985fc04eaae"
 
     [[snowmip.download]]
     sha256 = "598b525c7421fabf06de4c8d4d7e05d50b7655ad2387d98c4335e90fd5633d61"
     url = "https://caltech.box.com/shared/static/0vqhet1hsj36sgmy0ajrcrb24cihcfd7.gz"
+
+[soil_params_Gupta2020_2022]
+git-tree-sha1 = "c10e8f877603bfa2c018eb2dd0c51dd078abe5df"
+
+    [[soil_params_Gupta2020_2022.download]]
+    sha256 = "6205d96ae7724c469eef5cd1cf3b99e186637427b6fb65ecc659fb808fc6cacf"
+    url = "https://caltech.box.com/shared/static/7c6yx62tzjivxfmhqyy03r6e9l1glyu1.gz"
diff --git a/src/diagnostics/land_compute_methods.jl b/src/diagnostics/land_compute_methods.jl
index c7cca5e112..954e8019b4 100644
--- a/src/diagnostics/land_compute_methods.jl
+++ b/src/diagnostics/land_compute_methods.jl
@@ -70,6 +70,7 @@ end
 # Canopy - Conductance
 @land_compute "medlyn_term" SoilCanopyModel p.canopy.conductance.medlyn_term
 @land_compute "stomatal_conductance" SoilCanopyModel p.canopy.conductance.gs
+@land_compute "canopy_transpiration" SoilCanopyModel p.canopy.conductance.transpiration
 
 # Canopy - Energy
 @land_compute "canopy_aerodynamic_resistance" SoilCanopyModel p.canopy.energy.r_ae
@@ -77,33 +78,32 @@ end
 @land_compute "canopy_sensible_heat_flux" SoilCanopyModel p.canopy.energy.shf
 
 # Canopy - Hydraulics
-@land_compute "area_index" SoilCanopyModel p.canopy.hydraulics.area_index.leaf
 @land_compute "canopy_water_potential" SoilCanopyModel p.canopy.hydraulics.ψ
-@land_compute "cross_section" SoilCanopyModel p.canopy.hydraulics
+@land_compute "cross_section" SoilCanopyModel p.canopy.hydraulics.fa 
 @land_compute "cross_section_roots" SoilCanopyModel p.canopy.hydraulics.fa_roots
+@land_compute "leaf_area_index" SoilCanopyModel p.canopy.hydraulics.area_index.leaf
 @land_compute "moisture_stress_factor" SoilCanopyModel p.canopy.hydraulics.β
+@land_compute "root_area_index" SoilCanopyModel p.canopy.hydraulics.area_index.root
+@land_compute "stem_area_index" SoilCanopyModel p.canopy.hydraulics.area_index.stem
 
 # Canopy - Photosynthesis
 @land_compute "photosynthesis_net_canopy" SoilCanopyModel p.canopy.photosynthesis.GPP
 @land_compute "photosynthesis_net_leaf" SoilCanopyModel p.canopy.photosynthesis.An
 @land_compute "respiration_leaf" SoilCanopyModel p.canopy.photosynthesis.Rd
-@land_compute "vcmax25" SoilCanopyModel p.canopy.photosynthesis.vcmax25
+@land_compute "vcmax25" SoilCanopyModel p.canopy.photosynthesis.Vcmax25
 
 # Canopy - Radiative Transfer
-@land_compute "near_infrared_radiation" SoilCanopyModel p.canopy.radiative_transfer.nir
-@land_compute "near_infrared_radiation_absorbed" SoilCanopyModel p.canopy.radiative_transfer.anir
-@land_compute "near_infrared_radiation_reflected" SoilCanopyModel p.canopy.radiative_transfer.rnir
-@land_compute "near_infrared_radiation_transmitted" SoilCanopyModel p.canopy.radiative_transfer.tnir
-@land_compute "photosynthetically_active_radiation" SoilCanopyModel p.canopy.radiative_transfer.par
-@land_compute "photosynthetically_active_radiation_absorbed" SoilCanopyModel p.canopy.radiative_transfer.apar
-@land_compute "photosynthetically_active_radiation_reflected" SoilCanopyModel p.canopy.radiative_transfer.rpar
-@land_compute "photosynthetically_active_radiation_transmitted" SoilCanopyModel p.canopy.radiative_transfer.tpar
+@land_compute "near_infrared_radiation" SoilCanopyModel p.canopy.radiative_transfer.inc_nir
+@land_compute "near_infrared_radiation_absorbed" SoilCanopyModel p.canopy.radiative_transfer.nir.abs
+@land_compute "near_infrared_radiation_reflected" SoilCanopyModel p.canopy.radiative_transfer.nir.refl
+@land_compute "near_infrared_radiation_transmitted" SoilCanopyModel p.canopy.radiative_transfer.nir.trans
+@land_compute "photosynthetically_active_radiation" SoilCanopyModel p.canopy.radiative_transfer.inc_par
+@land_compute "photosynthetically_active_radiation_absorbed" SoilCanopyModel p.canopy.radiative_transfer.par.abs
+@land_compute "photosynthetically_active_radiation_reflected" SoilCanopyModel p.canopy.radiative_transfer.par.refl
+@land_compute "photosynthetically_active_radiation_transmitted" SoilCanopyModel p.canopy.radiative_transfer.par.trans
 @land_compute "radiation_longwave_net" SoilCanopyModel p.canopy.radiative_transfer.LW_n
 @land_compute "radiation_shortwave_net" SoilCanopyModel p.canopy.radiative_transfer.SW_n
 
-# Canopy - Transpiration
-@land_compute "canopy_transpiration" SoilCanopyModel p.canopy.transpiration
-
 ## Drivers Module ##
 
 @land_compute "air_co2" SoilCanopyModel p.drivers.c_co2
@@ -121,9 +121,6 @@ end
 @land_compute "infiltration" SoilCanopyModel p.soil.infiltration
 @land_compute "soil_hydraulic_conductivity" SoilCanopyModel p.soil.K
 @land_compute "soil_thermal_conductivity" SoilCanopyModel p.soil.κ
-@land_compute "soil_water_liquid" SoilCanopyModel top_center_to_surface(
-    p.soil.θ_l,
-)
 @land_compute "soil_water_potential" SoilCanopyModel p.soil.ψ
 @land_compute "soil_net_radiation" SoilCanopyModel p.soil.R_n
 @land_compute "soil_temperature" SoilCanopyModel p.soil.T
@@ -142,5 +139,9 @@ end
 # variables stored in Y (prognostic or state variables)
 
 @land_compute "canopy_temperature" SoilCanopyModel Y.canopy.energy.T
-@land_compute "soil_ice" SoilCanopyModel top_center_to_surface(Y.soil.θ_i)
 @land_compute "soilco2" SoilCanopyModel Y.soilco2.C
+@land_compute "soil_water_content" SoilCanopyModel Y.soil.ϑ_l
+@land_compute "plant_water_content" SoilCanopyModel Y.canopy.hydraulics.ϑ_l
+@land_compute "soil_ice_content" SoilCanopyModel Y.soil.θ_i
+@land_compute "soil_internal_energy" SoilCanopyModel Y.soil.ρe_int
+