Add 0 length message support