Add new still not-working code for native binary protocol version