Added additional metrics for 2.1.1