More updates to output format