Add more XEP-0118 support