Calibration class redesign to support BeadTypes