Better Team/Group linking