Improved heat exchanger base class models