Added scoreboard support