Make XDDecode optional