diff --git a/src/dd.jl b/src/dd.jl
index da19b9c..da58650 100644
--- a/src/dd.jl
+++ b/src/dd.jl
@@ -94640,16 +94640,32 @@ end
 
 balance_of_plant__power_plant__system() = balance_of_plant__power_plant__system{Float64}()
 
+mutable struct balance_of_plant__power_plant__heat_load{T} <: IDS{T}
+    var"breeder" :: Vector{<:T}
+    var"divertor" :: Vector{<:T}
+    var"wall" :: Vector{<:T}
+    _filled::Set{Symbol}
+    _frozen::Bool
+    _in_expression::Vector{Symbol}
+    _ref :: Union{Nothing,balance_of_plant__power_plant__heat_load}
+    _parent :: WeakRef
+end
+
+function balance_of_plant__power_plant__heat_load{T}() where T
+    ids = balance_of_plant__power_plant__heat_load{T}(T[], T[], T[], Set{Symbol}(), false, Symbol[], nothing, WeakRef(nothing))
+    return ids
+end
+
+balance_of_plant__power_plant__heat_load() = balance_of_plant__power_plant__heat_load{Float64}()
+
 mutable struct balance_of_plant__power_plant{T} <: IDS{T}
-    var"breeder_heat_load" :: Vector{<:T}
-    var"divertor_heat_load" :: Vector{<:T}
     var"generator_conversion_efficiency" :: Vector{<:T}
+    var"heat_load" :: balance_of_plant__power_plant__heat_load{T}
     var"power_cycle_type" :: String
     var"power_electric_generated" :: Vector{<:T}
     var"system" :: IDSvector{balance_of_plant__power_plant__system{T}}
     var"total_heat_rejected" :: Vector{<:T}
     var"total_heat_supplied" :: Vector{<:T}
-    var"wall_heat_load" :: Vector{<:T}
     _filled::Set{Symbol}
     _frozen::Bool
     _in_expression::Vector{Symbol}
@@ -94658,7 +94674,8 @@ mutable struct balance_of_plant__power_plant{T} <: IDS{T}
 end
 
 function balance_of_plant__power_plant{T}() where T
-    ids = balance_of_plant__power_plant{T}(T[], T[], T[], "", T[], IDSvector{balance_of_plant__power_plant__system{T}}(), T[], T[], T[], Set{Symbol}(), false, Symbol[], nothing, WeakRef(nothing))
+    ids = balance_of_plant__power_plant{T}(T[], balance_of_plant__power_plant__heat_load{T}(), "", T[], IDSvector{balance_of_plant__power_plant__system{T}}(), T[], T[], Set{Symbol}(), false, Symbol[], nothing, WeakRef(nothing))
+    setfield!(ids.heat_load, :_parent, WeakRef(ids))
     setfield!(ids.system, :_parent, WeakRef(ids))
     return ids
 end
@@ -96199,9 +96216,11 @@ const _all_info = Dict{String,Info}(
 "balance_of_plant.power_electric_plant_operation.system[:].subsystem[:].power" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "Electrical power used to operate the system", true),
 "balance_of_plant.power_electric_plant_operation.total_power" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "Total ", true),
 "balance_of_plant.power_plant" => Info{Tuple{}}((), "-", "STRUCTURE", "", true),
-"balance_of_plant.power_plant.breeder_heat_load" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "The heat flow towards the breeder.", true),
-"balance_of_plant.power_plant.divertor_heat_load" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "The heat flow towards the diverter", true),
 "balance_of_plant.power_plant.generator_conversion_efficiency" => Info{Tuple{String}}(("balance_of_plant.time",), "-", "FLT_1D", "Conversion efficiency of thermal to electric power of the steam cycle", true),
+"balance_of_plant.power_plant.heat_load" => Info{Tuple{}}((), "-", "STRUCTURE", "", true),
+"balance_of_plant.power_plant.heat_load.breeder" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "The heat flow towards the breeder.", true),
+"balance_of_plant.power_plant.heat_load.divertor" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "The heat flow towards the diverter", true),
+"balance_of_plant.power_plant.heat_load.wall" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "The heat flow towards the wall.", true),
 "balance_of_plant.power_plant.power_cycle_type" => Info{Tuple{}}((), "-", "STR_0D", "Type of primary power cycle, :brayton = gas, :rankine = steam", true),
 "balance_of_plant.power_plant.power_electric_generated" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "The net electric power produced by the thermal plant, equal tot the power produced by turbines LESS the power consumed by pumps and compressors", true),
 "balance_of_plant.power_plant.system[:]" => Info{Tuple{}}((), "-", "STRUCT_ARRAY", "", true),
@@ -96219,7 +96238,6 @@ const _all_info = Dict{String,Info}(
 "balance_of_plant.power_plant.system[:].name" => Info{Tuple{}}((), "-", "STR_0D", "Name of the system", true),
 "balance_of_plant.power_plant.total_heat_rejected" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "The total heat flow being rejected from the thermal plant", true),
 "balance_of_plant.power_plant.total_heat_supplied" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "The total heat flow being supplied to the thermal Plant (Fusion thermal power).", true),
-"balance_of_plant.power_plant.wall_heat_load" => Info{Tuple{String}}(("balance_of_plant.time",), "W", "FLT_1D", "The heat flow towards the wall.", true),
 "balance_of_plant.thermal_efficiency_cycle" => Info{Tuple{String}}(("balance_of_plant.time",), "-", "FLT_1D", "The fractional thermal effiency of the power cycle. Calculated as 1-Q_out/Q_in", true),
 "balance_of_plant.thermal_efficiency_plant" => Info{Tuple{String}}(("balance_of_plant.time",), "-", "FLT_1D", "The fractional thermal effiency of the entire BOP thermal plant, inlcudes all of the individual cycles. Calculated as 1-Q_out/Q_in", true),
 "balance_of_plant.time" => Info{Tuple{String}}(("1...N",), "s", "FLT_1D", "Generic time", true),