Saving more information on device change