-Refactor XStream serializer