Added additional metrics for post processing.