IMeasurementCalculator changes