ADEN-1591 Leaderboard refactoring
ADEN-1591 Leaderboard refactoring