Adds handshake and connection source handling