add token tags support
fix generator spec