Added support for overriding remote address in socket handshake