Added CalibrationPoint class