Improved scorecard implementation