[Ready][3.9] Add token entities