updated metrics and added template reporting