This doesn't use XStream any longer