Updated enthalpy definition