Relations revised, PersonBadges added