Move block methods into XmppConnectionService