Added jid to MessageSerializer