added commented code to include claims from associated identities