Adding Calibration class