Prepare for multiple identities support