measurement: add handling of measurements