added more features into the tokenizer