Added new scoring implementation