Improve file and URI utile
Use URI and File instead of String #1544