More changes for XML interfacing