[scr] Add improvements in a couple of metrics definition