Improvements to protocol message format

Signed-off-by: Mika Tammi <mikatammi@gmail.com>