Adjusted fserver xml generation