Data Token support changes

Related to https://github.com/aspnet/Routing/pull/88