I've been working on refactoring the JavaClient and there are similar changes to be made to the XMPP client. The idea is to make it generic like the Netty DiffSyncClient. I'd be happy to take this task so please assign it to me it you are cool with that.