Add token model migration
Fix a bug