More XEP198 work