Refactor MeasurementConvertor