Replaced usage of measure_id with measure_ids