Add XEP 0004 support