Updated various changes to support activities for a badge