I've made a first pass at merging JEP-0080 and JEP-0112: http://www.jabber.org/jeps/tmp/jep-0080-1.3.html Feedback is welcome before the Council considers these changes. Peter -- Peter Saint-Andre Jabber Software Foundation http://www.jabber.org/people/stpeter.shtml