Adding XS tags