Simplify enum-based fields
Add support for XEP-0107 Mood