Adding XML capability