refactored model/xml, round trip successful