ADEN-1591 Leaderboard refactoring