Added http handshake, amongst others