Switch to XStream XML encoder/decoder