Changed serializing to use XStream