ModelXSLTWriter improvements