Updated metrics to add timer routines, std. output