Measure detection added