Fixed externalization of identities