Update to USP connection handling