Calibrator class added