Improve XEP-0224