Improvements on XMPP