Added framework for Flexible ORP calibration