Added multi-scoreboard compatibility