Added custom tokenizer