Added scoreboard support #26