Modified ScoreboardManager