Changing up the badge schema