Refactored ranking service
Added new badges