Update for new output format