added XS 6.5 beta1 support, will change the version after XS 6.5 is released