Adding support for marshaling some more messages