Add x, xi and xmi extension detection