More changes to support URI cnxns