Added XML Marshalling