Use ByPropertyIdGrouper in Claims