Added proper XML serialization
ˆ