Badges

Added support for badges