Adding some badges stuff