Richer saving of calibration information