Added support for anonymising tokens