Change output to the new expected format