Changed ephemeral ID to persistent ID