Added validation to Badge and BadgeSet