Token support in Context, missing part