Changes in the protocol format to better deal with spaces.