Source for xmlpipe2 improved