That'd be fine by me, let's see if @pferraro has other thoughts... he still needs to look into all this new XML stuff.