HeatContext model update to match heat code update