Made URI more user-friendly.