Add functionality to output formatting