Adapt measure.py to new output format