Adding more processing for tokens