Fix latest merge
Add token entities