Changes to compute different scoring metrics