Measure.Execution refactored