Use URI instead of String #1544