Update to match XEP-0133