added tokenizer2 and consonant_vowel_map