Including non xmos tag
XPD tool updates