Measurement process refactor