Changes to the xml encoder. Works for all but the generator type.