Adding wirelesstags support