Updates in calibration objects handling