Data Token support changes