Adding support for sockets and URLs