Fixing up URI abstraction