Added support for arbitrary identities on the receiver