CHG: Improved handling of multiple calibration files