Changes to support URI cnxns