Started to work on XMPP issue