import now uses principal name as key. principalId and entityId are optional and generated when missing.