[3.9] Add token entities