Change the structure of returned data to be compatible with the old data