Refactor and add Scoreboard methods.