More updates to output for data-main.