Change the output structure