Better URI handling