Added tokens to expressions grouping