Adding macros to create Calibration objects