Adding better scoring functionality