Adding basic CHF handling