Updated for latest CH changes.