add X2Plus support