Better use of URI API