Revised Location and provider identification and saving approach