Tag: adding XEP support