More work on the binary protocol