Added Message Encoder / Decoder