Numeric and nonlex tokens handling added