Added parameter to enable the metrics calculation