Added basic support for multiple measurements.