allow classification on tokens and replace match function added