Support for P2P context / referenced roles