Measure control now works with area too