Updated for SOS 2.0, xmlbeans, result handling