Added Calibrator class.