back on XML support, made xml generator