Changed to save Uri to string and back