bug fix to populate all the metrics mentioned in the doc