Added Badges related resources and labels
Minor badges resources change