Add CalibrationMaker class