Updated with XMPP client and server communication classes