Improved scoreboard handling