Added metrics to CSV output