Continue work on the token replacement.
Deprecating all the old API function. But we might need them back.