Support for multiple measurements added