* Updated URI handling